Merge pull request #591 from CycloneDX/Polish_code

Author: nscuro

src/main/java/org/cyclonedx/model/component/crypto/AlgorithmProperties.java

@@ -29,7 +29,8 @@
     "mode",
     "padding",
     "cryptoFunctions",
-    "classicalSecurityLevel", "nistQuantumSecurityLevel"
+    "classicalSecurityLevel",
+    "nistQuantumSecurityLevel"
 })
 public class AlgorithmProperties
 {

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

@@ -48,17 +48,7 @@ private void serializeXml(List<Object> choices, ToXmlGenerator xmlGenerator) thr
       xmlGenerator.writeStartObject();
       for (Object choice : choices) {
         if (choice instanceof Property) {
-          xmlGenerator.writeFieldName("environmentVar");
-          xmlGenerator.writeStartObject();
-          Property prop = (Property) choice;
-          xmlGenerator.setNextIsAttribute(true);
-          xmlGenerator.writeFieldName("name");
-          xmlGenerator.writeString(prop.getName());
-          xmlGenerator.setNextIsAttribute(false);
-
-          xmlGenerator.setNextIsUnwrapped(true);
-          xmlGenerator.writeStringField("", prop.getValue());
-          xmlGenerator.writeEndObject();
+          SerializerUtils.serializeProperty("environmentVar", (Property) choice, xmlGenerator);
         } else if (choice instanceof String) {
           xmlGenerator.writeFieldName("value");
           xmlGenerator.writeString((String) choice);

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

@@ -54,20 +54,13 @@ else if (input.getData() != null) {
       jsonGenerator.writeObject(input.getData());
     }
 
-    writeField(jsonGenerator, "source", input.getSource());
-    writeField(jsonGenerator, "target", input.getTarget());
-    writeField(jsonGenerator, "properties", input.getProperties());
+    SerializerUtils.writeField(jsonGenerator, "source", input.getSource());
+    SerializerUtils.writeField(jsonGenerator, "target", input.getTarget());
+    SerializerUtils.writeField(jsonGenerator, "properties", input.getProperties());
 
     jsonGenerator.writeEndObject();
   }
 
-  protected void writeField(JsonGenerator jsonGenerator, String fieldName, Object fieldValue) throws IOException {
-    if (fieldValue != null) {
-      jsonGenerator.writeFieldName(fieldName);
-      jsonGenerator.writeObject(fieldValue);
-    }
-  }
-
   @Override
   public Class<InputType> handledType() {
     return InputType.class;

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

@@ -50,10 +50,10 @@ else if (output.getData() != null) {
       jsonGenerator.writeObject( output.getData());
     }
 
-    writeField(jsonGenerator, "type", output.getType());
-    writeField(jsonGenerator, "source", output.getSource());
-    writeField(jsonGenerator, "target", output.getTarget());
-    writeField(jsonGenerator, "properties", output.getProperties());
+    SerializerUtils.writeField(jsonGenerator, "type", output.getType());
+    SerializerUtils.writeField(jsonGenerator, "source", output.getSource());
+    SerializerUtils.writeField(jsonGenerator, "target", output.getTarget());
+    SerializerUtils.writeField(jsonGenerator, "properties", output.getProperties());
     jsonGenerator.writeEndObject();
   }
 
@@ -93,13 +93,6 @@ else if (output.getData() != null) {
     xmlGenerator.writeEndObject();
   }
 
-  protected void writeField(JsonGenerator jsonGenerator, String fieldName, Object fieldValue) throws IOException {
-    if (fieldValue != null) {
-      jsonGenerator.writeFieldName(fieldName);
-      jsonGenerator.writeObject(fieldValue);
-    }
-  }
-
   @Override
   public Class<OutputType> handledType() {
     return OutputType.class;

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

@@ -55,15 +55,7 @@ private static void serializeXml(final List<Property> properties, final ToXmlGen
   {
     xmlGenerator.writeStartArray();
     for (Property property : properties) {
-      xmlGenerator.writeStartObject("property");
-      xmlGenerator.setNextIsAttribute(true);
-      xmlGenerator.writeFieldName("name");
-      xmlGenerator.writeString(property.getName());
-      xmlGenerator.setNextIsAttribute(false);
-
-      xmlGenerator.setNextIsUnwrapped(true);
-      xmlGenerator.writeStringField("", property.getValue());
-      xmlGenerator.writeEndObject();
+      SerializerUtils.serializeProperty("property", property, xmlGenerator);
     }
     xmlGenerator.writeEndArray();
   }

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

@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;
 import org.cyclonedx.Version;
 import org.cyclonedx.model.Hash;
+import org.cyclonedx.model.Property;
 import org.cyclonedx.model.VersionFilter;
 
 public class SerializerUtils
@@ -42,5 +43,23 @@ public static boolean shouldSerializeField(Object obj, Version version, String f
     }
   }
 
+  public static void serializeProperty(String propertyName,  Property prop, ToXmlGenerator xmlGenerator) throws IOException {
+    xmlGenerator.writeFieldName(propertyName);
+    xmlGenerator.writeStartObject();
+    xmlGenerator.setNextIsAttribute(true);
+    xmlGenerator.writeFieldName("name");
+    xmlGenerator.writeString(prop.getName());
+    xmlGenerator.setNextIsAttribute(false);
 
+    xmlGenerator.setNextIsUnwrapped(true);
+    xmlGenerator.writeStringField("", prop.getValue());
+    xmlGenerator.writeEndObject();
+  }
+
+  public static void writeField(JsonGenerator jsonGenerator, String fieldName, Object fieldValue) throws IOException {
+    if (fieldValue != null) {
+      jsonGenerator.writeFieldName(fieldName);
+      jsonGenerator.writeObject(fieldValue);
+    }
+  }
 }

src/test/java/org/cyclonedx/BomJsonGeneratorTest.java

@@ -20,10 +20,8 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 
-import java.io.FileReader;
 import java.nio.charset.StandardCharsets;
 import org.apache.commons.io.IOUtils;
-import org.cyclonedx.exception.GeneratorException;
 import org.cyclonedx.generators.BomGeneratorFactory;
 import org.cyclonedx.generators.json.BomJsonGenerator;
 import org.cyclonedx.generators.xml.BomXmlGenerator;
@@ -33,10 +31,8 @@
 import org.cyclonedx.model.License;
 import org.cyclonedx.model.LicenseChoice;
 import org.cyclonedx.model.Metadata;
-import org.cyclonedx.model.OrganizationalContact;
 import org.cyclonedx.model.Service;
 import org.cyclonedx.model.license.Expression;
-import org.cyclonedx.model.metadata.ToolInformation;
 import org.cyclonedx.parsers.JsonParser;
 import org.cyclonedx.parsers.XmlParser;
 import org.junit.jupiter.api.AfterEach;
@@ -52,10 +48,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.UUID;
 import java.util.stream.Stream;
 import java.util.Objects;