Minor cleanup

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/dataformat/xml/XmlTypeResolverBuilder.java

@@ -34,7 +34,6 @@ public XmlTypeResolverBuilder(JsonTypeInfo.Value settings) {
     @Override
     public StdTypeResolverBuilder init(JsonTypeInfo.Id idType, TypeIdResolver idRes)
     {
-
         super.init(idType, idRes);
         if (_typeProperty != null) {
             _typeProperty = StaxUtil.sanitizeXmlTypeName(_typeProperty);
@@ -89,7 +88,6 @@ protected TypeIdResolver idResolver(MapperConfig<?> config,
     /**********************************************************************
      */
 
-
     /**
      * Helper method for encoding regular Java class name in form that
      * can be used as XML element name.
@@ -138,6 +136,8 @@ protected static String decodeXmlClassName(String className)
     protected static class XmlClassNameIdResolver
         extends ClassNameIdResolver
     {
+        private static final long serialVersionUID = 2L;
+
         public XmlClassNameIdResolver(JavaType baseType, TypeFactory typeFactory,
                 PolymorphicTypeValidator ptv)
         {
@@ -159,6 +159,8 @@ public JavaType typeFromId(DatabindContext context, String id) throws IOExceptio
     protected static class XmlMinimalClassNameIdResolver
         extends MinimalClassNameIdResolver
     {
+        private static final long serialVersionUID = 2L;
+
         public XmlMinimalClassNameIdResolver(JavaType baseType, TypeFactory typeFactory,
                 PolymorphicTypeValidator ptv)
         {

src/main/java/com/fasterxml/jackson/dataformat/xml/ser/ToXmlGenerator.java

@@ -247,15 +247,18 @@ public void initGenerator()  throws IOException
         }
         _initialized = true;
         try {
+            boolean xmlDeclWritten;
             if (Feature.WRITE_XML_1_1.enabledIn(_formatFeatures)) {
                 _xmlWriter.writeStartDocument("UTF-8", "1.1");
+                xmlDeclWritten = true;
             } else if (Feature.WRITE_XML_DECLARATION.enabledIn(_formatFeatures)) {
                 _xmlWriter.writeStartDocument("UTF-8", "1.0");
+                xmlDeclWritten = true;
             } else {
-                return;
+                xmlDeclWritten = false;
             }
             // as per [dataformat-xml#172], try adding indentation
-            if (_xmlPrettyPrinter != null) {
+            if (xmlDeclWritten && (_xmlPrettyPrinter != null)) {
                 // ... but only if it is likely to succeed:
                 if (!_stax2Emulation) {
                     _xmlPrettyPrinter.writePrologLinefeed(_xmlWriter);
@@ -487,10 +490,11 @@ public void writeRepeatedFieldName() throws IOException
     /* JsonGenerator method overrides
     /**********************************************************
      */
-    
-    /* Most overrides in this section are just to make methods final,
-     * to allow better inlining...
-     */
+
+    @Override
+    public void writeFieldName(SerializableString name) throws IOException {
+        writeFieldName(name.getValue());
+    }
 
     @Override
     public final void writeFieldName(String name) throws IOException
@@ -640,12 +644,6 @@ public final void _handleEndObject() throws IOException
     /**********************************************************
      */
 
-    @Override
-    public void writeFieldName(SerializableString name) throws IOException
-    {
-        writeFieldName(name.getValue());
-    }
-
     @Override
     public void writeString(String text) throws IOException
     {