Merge pull request #773 from nscuro/fix-authors-serialization

Author: nscuro

pom.xml

@@ -193,6 +193,13 @@
             <artifactId>junit-jupiter-params</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>net.javacrumbs.json-unit</groupId>
+            <artifactId>json-unit-assertj</artifactId>
+            <version>5.1.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/org/cyclonedx/util/serializer/AuthorsSerializer.java

@@ -74,4 +74,10 @@ public void serialize(List<OrganizationalContact> authors, JsonGenerator gen, Se
             gen.writeEndArray();
         }
     }
+
+    @Override
+    public boolean isEmpty(SerializerProvider provider, List<OrganizationalContact> value) {
+        return value == null || value.isEmpty();
+    }
+
 }

src/test/java/org/cyclonedx/Issue638ComprehensiveTest.java

@@ -31,8 +31,10 @@
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
+import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -202,6 +204,54 @@ public void testV15_XML_SerializeAuthorString() throws Exception {
     // VERSION 1.6 TESTS - Both 'author' (deprecated) and 'authors' exist
     // ============================================================================
 
+    @Test
+    @DisplayName("v1.6 XML: Serialize component with null authors list")
+    public void testV16_XML_SerializeNullAuthorsList() throws Exception {
+        Component component = createComponentWithAuthorsList(
+                null
+        );
+        Bom bom = createBom(component);
+
+        BomXmlGenerator generator = BomGeneratorFactory.createXml(Version.VERSION_16, bom);
+        String xml = generator.toXmlString();
+
+        assertThat(xml).isEqualTo(/* language=XML */ """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+                  <components>
+                    <component type="library">
+                      <name>test-lib</name>
+                      <version>1.0.0</version>
+                    </component>
+                  </components>
+                </bom>
+                """);
+    }
+
+    @Test
+    @DisplayName("v1.6 XML: Serialize component with empty authors list")
+    public void testV16_XML_SerializeEmptyAuthorsList() throws Exception {
+        Component component = createComponentWithAuthorsList(
+                Collections.emptyList()
+        );
+        Bom bom = createBom(component);
+
+        BomXmlGenerator generator = BomGeneratorFactory.createXml(Version.VERSION_16, bom);
+        String xml = generator.toXmlString();
+
+        assertThat(xml).isEqualTo(/* language=XML */ """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+                  <components>
+                    <component type="library">
+                      <name>test-lib</name>
+                      <version>1.0.0</version>
+                    </component>
+                  </components>
+                </bom>
+                """);
+    }
+
     @Test
     @DisplayName("v1.6 XML: Serialize component with ONLY author string (deprecated field)")
     public void testV16_XML_SerializeOnlyAuthorString() throws Exception {
@@ -421,6 +471,50 @@ public void testV16_JSON_SerializeOnlyAuthorString() throws Exception {
         assertThat(json).doesNotContain("\"authors\"");
     }
 
+    @Test
+    @DisplayName("v1.6 JSON: Serialize component with null authors list")
+    public void testV16_JSON_SerializeNullAuthorsList() throws Exception {
+        Component component = createComponentWithAuthorsList(
+                null
+        );
+        Bom bom = createBom(component);
+
+        BomJsonGenerator generator = BomGeneratorFactory.createJson(Version.VERSION_16, bom);
+        String json = generator.toJsonString();
+
+        assertThatJson(json)
+                .inPath("$.components[0]")
+                .isEqualTo(/* language=JSON */ """
+                        {
+                          "type": "library",
+                          "name": "test-lib",
+                          "version": "1.0.0"
+                        }
+                        """);
+    }
+
+    @Test
+    @DisplayName("v1.6 JSON: Serialize component with empty authors list")
+    public void testV16_JSON_SerializeEmptyAuthorsList() throws Exception {
+        Component component = createComponentWithAuthorsList(
+                Collections.emptyList()
+        );
+        Bom bom = createBom(component);
+
+        BomJsonGenerator generator = BomGeneratorFactory.createJson(Version.VERSION_16, bom);
+        String json = generator.toJsonString();
+
+        assertThatJson(json)
+                .inPath("$.components[0]")
+                .isEqualTo(/* language=JSON */ """
+                        {
+                          "type": "library",
+                          "name": "test-lib",
+                          "version": "1.0.0"
+                        }
+                        """);
+    }
+
     @Test
     @DisplayName("v1.6 JSON: Serialize component with ONLY authors list")
     public void testV16_JSON_SerializeOnlyAuthorsList() throws Exception {