Merge branch '2.7'

Author: cowtowncoder

release-notes/VERSION

@@ -8,6 +8,10 @@ Project: jackson-dataformat-xml
 
 No changes since 2.7.
 
+2.7.5 (not yet released)
+
+No changes since 2.7.4
+
 2.7.4 (29-Apr-2016)
 
 #178: Problem with polymorphic serialization, inclusion type of

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

@@ -1,5 +1,6 @@
 package com.fasterxml.jackson.dataformat.xml;
 
+import java.io.IOException;
 import java.util.Collection;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -127,7 +128,7 @@ public String idFromValue(Object value)
         }
 
         @Override
-        public JavaType typeFromId(DatabindContext context, String id) {
+        public JavaType typeFromId(DatabindContext context, String id) throws IOException {
             return super.typeFromId(context, decodeXmlClassName(id));
         }
     }
@@ -147,7 +148,7 @@ public String idFromValue(Object value)
         }
 
         @Override
-        public JavaType typeFromId(DatabindContext context, String id) {
+        public JavaType typeFromId(DatabindContext context, String id) throws IOException {
             return super.typeFromId(context, decodeXmlClassName(id));
         }
     }

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

@@ -296,6 +296,11 @@ public ToXmlGenerator configure(Feature f, boolean state) {
     @Override
     public boolean canWriteFormattedNumbers() { return true; }
 
+    // @since 2.7.5
+    public boolean inRoot() {
+        return _writeContext.inRoot();
+    }
+
     /*
     /**********************************************************
     /* Extended API, access to some internal components
@@ -1056,7 +1061,12 @@ public void close() throws IOException
         if (isEnabled(JsonGenerator.Feature.AUTO_CLOSE_JSON_CONTENT)) {
             try {
                 while (true) {
-                    JsonStreamContext ctxt = getOutputContext();
+		    /* 28-May-2016, tatu: To work around incompatibility introduced by
+		     *     `jackson-core` 2.8 where return type of `getOutputContext()`
+		     *     changed, let's do direct access here.
+		     */
+//                    JsonStreamContext ctxt = getOutputContext();
+		    JsonStreamContext ctxt = _writeContext;
                     if (ctxt.inArray()) {
                         writeEndArray();
                     } else if (ctxt.inObject()) {

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

@@ -214,12 +214,12 @@ protected void _startRootArray(ToXmlGenerator xgen, QName rootName) throws IOExc
     protected void _initWithRootName(ToXmlGenerator xgen, QName rootName) throws IOException
     {
         /* 28-Nov-2012, tatu: We should only initialize the root
-         *  name if no name has been set, as per [Issue#42],
+         *  name if no name has been set, as per [dataformat-xml#42],
          *  to allow for custom serializers to work.
          */
         if (!xgen.setNextNameIfMissing(rootName)) {
             // however, if we are root, we... insist
-            if (xgen.getOutputContext().inRoot()) {
+            if (xgen.inRoot()) {
                 xgen.setNextName(rootName);
             }
         }