Merge pull request #186 from CycloneDX/Improvements

Polish Code

Author: stevespringett

src/main/java/org/cyclonedx/model/vulnerability/Vulnerability10.java

@@ -29,7 +29,6 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import org.cyclonedx.model.ExtensibleType;
-import org.cyclonedx.model.Source;
 
 @JsonRootName(Vulnerability10.NAME)
 public class Vulnerability10

src/main/java/org/cyclonedx/util/DependencySerializer.java

@@ -32,11 +32,8 @@
 
 public class DependencySerializer extends StdSerializer<List<Dependency>>
 {
-  private final String NAMESPACE_PREFIX = "dg";
-  private final String DEPENDENCY = "dependency";
-  private final String DEPENDENCIES = "dependencies";
   private final String REF = "ref";
-  private final String NAMESPACE_URI = "http://cyclonedx.org/schema/ext/dependency-graph/1.0";
+
   private boolean useNamespace = false;
 
   public DependencySerializer(final boolean useNamespace) {
@@ -91,18 +88,7 @@ private void writeXMLDependenciesWithGenerator(final ToXmlGenerator toXmlGenerat
       throws IOException, XMLStreamException
   {
     if (dependencies != null && !dependencies.isEmpty()) {
-      QName qName;
-
-      if (useNamespace) {
-        qName = new QName(NAMESPACE_URI, DEPENDENCIES, NAMESPACE_PREFIX);
-        toXmlGenerator.getStaxWriter().setPrefix(qName.getPrefix(), qName.getNamespaceURI());
-      } else {
-        qName = new QName(DEPENDENCIES);
-      }
-
-      toXmlGenerator.setNextName(qName);
-      toXmlGenerator.writeStartObject();
-      toXmlGenerator.writeFieldName(qName.getLocalPart());
+      processNamespace(toXmlGenerator, "dependencies");
       toXmlGenerator.writeStartArray();
 
       for (Dependency dependency : dependencies) {
@@ -117,18 +103,7 @@ private void writeXMLDependenciesWithGenerator(final ToXmlGenerator toXmlGenerat
   private void writeXMLDependency(final Dependency dependency, final ToXmlGenerator generator)
       throws IOException, XMLStreamException
   {
-    QName qName;
-    if (useNamespace) {
-      qName = new QName(NAMESPACE_URI, DEPENDENCY, NAMESPACE_PREFIX);
-      generator.getStaxWriter().setPrefix(qName.getPrefix(), qName.getNamespaceURI());
-    } else {
-      qName = new QName(DEPENDENCY);
-    }
-
-    generator.setNextName(qName);
-
-    generator.writeStartObject();
-    generator.writeFieldName(qName.getLocalPart());
+    processNamespace(generator, "dependency");
 
     if (dependency.getDependencies() != null && !dependency.getDependencies().isEmpty()) {
       generator.writeStartArray();
@@ -152,4 +127,21 @@ private void writeXMLDependency(final Dependency dependency, final ToXmlGenerato
 
     generator.writeEndObject();
   }
+
+  private void processNamespace(final ToXmlGenerator toXmlGenerator, final String dependencies)
+      throws XMLStreamException, IOException
+  {
+    QName qName;
+
+    if (useNamespace) {
+      qName = new QName("http://cyclonedx.org/schema/ext/dependency-graph/1.0", dependencies, "dg");
+      toXmlGenerator.getStaxWriter().setPrefix(qName.getPrefix(), qName.getNamespaceURI());
+    } else {
+      qName = new QName(dependencies);
+    }
+
+    toXmlGenerator.setNextName(qName);
+    toXmlGenerator.writeStartObject();
+    toXmlGenerator.writeFieldName(qName.getLocalPart());
+  }
 }

src/main/java/org/cyclonedx/util/ExtensibleTypesSerializer.java

@@ -35,8 +35,6 @@ public class ExtensibleTypesSerializer extends StdSerializer<List<ExtensibleType
 {
   private final String XMLNS = "xmlns";
 
-  private final String DEFAULT_VALID_NAMESPACE = "http://www.w3.org/1999/xhtml";
-
   public ExtensibleTypesSerializer() {
     this(null);
   }
@@ -70,7 +68,7 @@ public void serialize(
               }
             }
           } else {
-            staxWriter.writeStartElement(ext.getNamespace(), ext.getName(), DEFAULT_VALID_NAMESPACE);
+            staxWriter.writeStartElement(ext.getNamespace(), ext.getName(), "http://www.w3.org/1999/xhtml");
           }
 
           if (ext.getExtensibleTypes() != null && !ext.getExtensibleTypes().isEmpty()) {

src/main/java/org/cyclonedx/util/ExtensionDeserializer.java

@@ -43,7 +43,6 @@
 import org.cyclonedx.model.vulnerability.Vulnerability10.Score;
 import org.cyclonedx.model.vulnerability.Vulnerability10.ScoreSource;
 import org.cyclonedx.model.vulnerability.Vulnerability10.Severity;
-import org.cyclonedx.model.Source;
 
 public class ExtensionDeserializer extends StdDeserializer<Extension>
 {

src/main/java/org/cyclonedx/util/TrimStringSerializer.java

@@ -19,7 +19,6 @@
 package org.cyclonedx.util;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
 import java.io.IOException;

src/main/java/org/cyclonedx/util/VulnerabilityDeserializer.java

@@ -18,8 +18,6 @@
  */
 package org.cyclonedx.util;
 
-import java.util.ArrayList;
-import java.util.ArrayList;
 import java.util.List;
 
 import com.fasterxml.jackson.core.JsonParser;

src/test/java/org/cyclonedx/parse/BaseParseTest.java

@@ -21,8 +21,6 @@
 import org.cyclonedx.BomGeneratorFactory;
 import org.cyclonedx.BomParserFactory;
 import org.cyclonedx.CycloneDxSchema;
-import org.cyclonedx.CycloneDxSchema.Version;
-import org.cyclonedx.exception.GeneratorException;
 import org.cyclonedx.exception.ParseException;
 import org.cyclonedx.generators.json.BomJsonGenerator;
 import org.cyclonedx.generators.xml.BomXmlGenerator;
@@ -49,7 +47,7 @@ public abstract class BaseParseTest {
         VERSIONS.add(CycloneDxSchema.Version.VERSION_14);
     }
 
-    List<File> getAllResources() throws Exception {
+    List<File> getAllResources() {
         final List<File> files = new ArrayList<>();
         for (CycloneDxSchema.Version version: VERSIONS) {
             files.addAll(getResources(version.getVersionString() + "/"));