Code improvement

Signed-off-by: aalzate <[email protected]>

Author: mr-zepol

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,7 +88,7 @@ private void writeXMLDependenciesWithGenerator(final ToXmlGenerator toXmlGenerat
       throws IOException, XMLStreamException
   {
     if (dependencies != null && !dependencies.isEmpty()) {
-      processNamespace(toXmlGenerator, DEPENDENCIES);
+      processNamespace(toXmlGenerator, "dependencies");
       toXmlGenerator.writeStartArray();
 
       for (Dependency dependency : dependencies) {
@@ -106,7 +103,7 @@ private void writeXMLDependenciesWithGenerator(final ToXmlGenerator toXmlGenerat
   private void writeXMLDependency(final Dependency dependency, final ToXmlGenerator generator)
       throws IOException, XMLStreamException
   {
-    processNamespace(generator, DEPENDENCY);
+    processNamespace(generator, "dependency");
 
     if (dependency.getDependencies() != null && !dependency.getDependencies().isEmpty()) {
       generator.writeStartArray();
@@ -131,16 +128,16 @@ private void writeXMLDependency(final Dependency dependency, final ToXmlGenerato
     generator.writeEndObject();
   }
 
-  private void processNamespace(final ToXmlGenerator toXmlGenerator, final String dependencies2)
+  private void processNamespace(final ToXmlGenerator toXmlGenerator, final String dependencies)
       throws XMLStreamException, IOException
   {
     QName qName;
 
     if (useNamespace) {
-      qName = new QName(NAMESPACE_URI, dependencies2, NAMESPACE_PREFIX);
+      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(dependencies2);
+      qName = new QName(dependencies);
     }
 
     toXmlGenerator.setNextName(qName);

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()) {