fix: AccessMode such that it is optional (#358)

Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
CycloneDX · Sep 15, 2024 · 97fe22d · 97fe22d
1 parent 1ab1cc2
commit 97fe22d
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 15 deletions.
diff --git a/src/CycloneDX.Core/Models/Workspace.cs b/src/CycloneDX.Core/Models/Workspace.cs
@@ -77,10 +77,25 @@ public enum AccessModeType
         public ResourceReferenceChoices ResourceReferences { get; set; }
         public bool ShouldSerializeResourceReferences() { return ResourceReferences?.Count > 0; }
 
-        [XmlElement("accessMode")]
+        [XmlIgnore]
         [ProtoMember(8)]
-        public AccessModeType AccessMode { get; set; }
-
+        public AccessModeType? AccessMode { get; set; }
+
+        [XmlElement("accessMode")]
+        [JsonIgnore]
+        public AccessModeType NonNullableAccessMode
+        {
+            get
+            {
+                return AccessMode.Value;
+            }
+            set
+            {
+                AccessMode = value;
+            }
+        }
+        public bool ShouldSerializeNonNullableAccessMode() { return AccessMode.HasValue; }
+
         [XmlElement("mountPath")]
         [ProtoMember(9)]
         public string MountPath { get; set; }

diff --git a/...5/__snapshots__/SerializationTests.JsonRoundTripAsyncTest_valid-formulation-1.5.json.snap b/...5/__snapshots__/SerializationTests.JsonRoundTripAsyncTest_valid-formulation-1.5.json.snap
@@ -79,8 +79,7 @@
                 {
                   "bom-ref": "workspace-1",
                   "uid": "workspace-uid-1",
-                  "name": "workspace",
-                  "accessMode": "read-only"
+                  "name": "workspace"
                 }
               ],
               "runtimeTopology": [

diff --git a/...n/v1.5/__snapshots__/SerializationTests.JsonRoundTripTest_valid-formulation-1.5.json.snap b/...n/v1.5/__snapshots__/SerializationTests.JsonRoundTripTest_valid-formulation-1.5.json.snap
@@ -79,8 +79,7 @@
                 {
                   "bom-ref": "workspace-1",
                   "uid": "workspace-uid-1",
-                  "name": "workspace",
-                  "accessMode": "read-only"
+                  "name": "workspace"
                 }
               ],
               "runtimeTopology": [

diff --git a/...6/__snapshots__/SerializationTests.JsonRoundTripAsyncTest_valid-formulation-1.6.json.snap b/...6/__snapshots__/SerializationTests.JsonRoundTripAsyncTest_valid-formulation-1.6.json.snap
@@ -79,8 +79,7 @@
                 {
                   "bom-ref": "workspace-1",
                   "uid": "workspace-uid-1",
-                  "name": "workspace",
-                  "accessMode": "read-only"
+                  "name": "workspace"
                 }
               ],
               "runtimeTopology": [

diff --git a/...n/v1.6/__snapshots__/SerializationTests.JsonRoundTripTest_valid-formulation-1.6.json.snap b/...n/v1.6/__snapshots__/SerializationTests.JsonRoundTripTest_valid-formulation-1.6.json.snap
@@ -79,8 +79,7 @@
                 {
                   "bom-ref": "workspace-1",
                   "uid": "workspace-uid-1",
-                  "name": "workspace",
-                  "accessMode": "read-only"
+                  "name": "workspace"
                 }
               ],
               "runtimeTopology": [

diff --git a/....5/__snapshots__/SerializationTests.XmlRoundTripStreamTest_valid-formulation-1.5.xml.snap b/....5/__snapshots__/SerializationTests.XmlRoundTripStreamTest_valid-formulation-1.5.xml.snap
@@ -69,7 +69,6 @@
                 <workspace bom-ref="workspace-1">
                   <uid>workspace-uid-1</uid>
                   <name>workspace</name>
-                  <accessMode>read-only</accessMode>
                 </workspace>
               </workspaces>
               <runtimeTopology>

diff --git a/...Xml/v1.5/__snapshots__/SerializationTests.XmlRoundTripTest_valid-formulation-1.5.xml.snap b/...Xml/v1.5/__snapshots__/SerializationTests.XmlRoundTripTest_valid-formulation-1.5.xml.snap
@@ -69,7 +69,6 @@
                 <workspace bom-ref="workspace-1">
                   <uid>workspace-uid-1</uid>
                   <name>workspace</name>
-                  <accessMode>read-only</accessMode>
                 </workspace>
               </workspaces>
               <runtimeTopology>

diff --git a/....6/__snapshots__/SerializationTests.XmlRoundTripStreamTest_valid-formulation-1.6.xml.snap b/....6/__snapshots__/SerializationTests.XmlRoundTripStreamTest_valid-formulation-1.6.xml.snap
@@ -69,7 +69,6 @@
                 <workspace bom-ref="workspace-1">
                   <uid>workspace-uid-1</uid>
                   <name>workspace</name>
-                  <accessMode>read-only</accessMode>
                 </workspace>
               </workspaces>
               <runtimeTopology>

diff --git a/...Xml/v1.6/__snapshots__/SerializationTests.XmlRoundTripTest_valid-formulation-1.6.xml.snap b/...Xml/v1.6/__snapshots__/SerializationTests.XmlRoundTripTest_valid-formulation-1.6.xml.snap
@@ -69,7 +69,6 @@
                 <workspace bom-ref="workspace-1">
                   <uid>workspace-uid-1</uid>
                   <name>workspace</name>
-                  <accessMode>read-only</accessMode>
                 </workspace>
               </workspaces>
               <runtimeTopology>