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

andreas-hilti · web-flow · commit 97fe22dc74ba · 2024-09-15T18:27:43.000+02:00
Signed-off-by: andreas hilti &lt;69210561+andreas-hilti@users.noreply.github.com&gt;
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/tests/CycloneDX.Core.Tests/Json/v1.5/__snapshots__/SerializationTests.JsonRoundTripAsyncTest_valid-formulation-1.5.json.snap b/tests/CycloneDX.Core.Tests/Json/v1.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/tests/CycloneDX.Core.Tests/Json/v1.5/__snapshots__/SerializationTests.JsonRoundTripTest_valid-formulation-1.5.json.snap b/tests/CycloneDX.Core.Tests/Json/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/tests/CycloneDX.Core.Tests/Json/v1.6/__snapshots__/SerializationTests.JsonRoundTripAsyncTest_valid-formulation-1.6.json.snap b/tests/CycloneDX.Core.Tests/Json/v1.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/tests/CycloneDX.Core.Tests/Json/v1.6/__snapshots__/SerializationTests.JsonRoundTripTest_valid-formulation-1.6.json.snap b/tests/CycloneDX.Core.Tests/Json/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/tests/CycloneDX.Core.Tests/Xml/v1.5/__snapshots__/SerializationTests.XmlRoundTripStreamTest_valid-formulation-1.5.xml.snap b/tests/CycloneDX.Core.Tests/Xml/v1.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/tests/CycloneDX.Core.Tests/Xml/v1.5/__snapshots__/SerializationTests.XmlRoundTripTest_valid-formulation-1.5.xml.snap b/tests/CycloneDX.Core.Tests/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/tests/CycloneDX.Core.Tests/Xml/v1.6/__snapshots__/SerializationTests.XmlRoundTripStreamTest_valid-formulation-1.6.xml.snap b/tests/CycloneDX.Core.Tests/Xml/v1.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/tests/CycloneDX.Core.Tests/Xml/v1.6/__snapshots__/SerializationTests.XmlRoundTripTest_valid-formulation-1.6.xml.snap b/tests/CycloneDX.Core.Tests/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>

Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,7 @@`
`79`	`79`	`{`
`80`	`80`	`"bom-ref": "workspace-1",`
`81`	`81`	`"uid": "workspace-uid-1",`
`82`		`- "name": "workspace",`
`83`		`- "accessMode": "read-only"`
	`82`	`+ "name": "workspace"`
`84`	`83`	`}`
`85`	`84`	`],`
`86`	`85`	`"runtimeTopology": [`