root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Compatibility with XStream 1.4.5 

XStream 1.4.5 doesn't check a given ConverterLookup for a ConverterRegistry implementation anymore, so we have to manually perform that check and assignment.

Issue: SPR-11147
This commit is contained in:
Juergen Hoeller 2013-12-09 22:47:16 +01:00
parent 242ecdc448
commit 26d143868f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
View File

@ -27,7 +27,6 @@ import java.lang.reflect.Constructor;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLEventWriter; import javax.xml.stream.XMLEventWriter;
import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamException;
@ -62,7 +61,6 @@ import com.thoughtworks.xstream.io.xml.XppDriver;
import com.thoughtworks.xstream.mapper.CannotResolveClassException; import com.thoughtworks.xstream.mapper.CannotResolveClassException;
import com.thoughtworks.xstream.mapper.Mapper; import com.thoughtworks.xstream.mapper.Mapper;
import com.thoughtworks.xstream.mapper.MapperWrapper; import com.thoughtworks.xstream.mapper.MapperWrapper;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element; import org.w3c.dom.Element;
import org.w3c.dom.Node; import org.w3c.dom.Node;
@ -70,6 +68,7 @@ import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import org.xml.sax.XMLReader; import org.xml.sax.XMLReader;
import org.xml.sax.ext.LexicalHandler; import org.xml.sax.ext.LexicalHandler;
import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
import org.springframework.oxm.MarshallingFailureException; import org.springframework.oxm.MarshallingFailureException;
@ -133,7 +132,7 @@ public class XStreamMarshaller extends AbstractMarshaller implements Initializin
private ConverterLookup converterLookup = new DefaultConverterLookup(); private ConverterLookup converterLookup = new DefaultConverterLookup();
private ConverterRegistry converterRegistry; private ConverterRegistry converterRegistry = (ConverterRegistry) this.converterLookup;
private ConverterMatcher[] converters; private ConverterMatcher[] converters;
@ -211,6 +210,9 @@ public class XStreamMarshaller extends AbstractMarshaller implements Initializin
*/ */
public void setConverterLookup(ConverterLookup converterLookup) { public void setConverterLookup(ConverterLookup converterLookup) {
this.converterLookup = converterLookup; this.converterLookup = converterLookup;
if (converterLookup instanceof ConverterRegistry) {
this.converterRegistry = (ConverterRegistry) converterLookup;
}
} }
/** /**
@ -378,7 +380,10 @@ public class XStreamMarshaller extends AbstractMarshaller implements Initializin
* standard constructors or creating a custom subclass. * standard constructors or creating a custom subclass.
* @return the {@code XStream} instance * @return the {@code XStream} instance
*/ */
@SuppressWarnings("deprecation")
protected XStream constructXStream() { protected XStream constructXStream() {
// The referenced XStream constructor has been deprecated as of 1.4.5.
// We're preserving this call for broader XStream 1.4.x compatibility.
return new XStream(this.reflectionProvider, this.streamDriver, return new XStream(this.reflectionProvider, this.streamDriver,
this.beanClassLoader, this.mapper, this.converterLookup, this.converterRegistry) { this.beanClassLoader, this.mapper, this.converterLookup, this.converterRegistry) {
@Override @Override