Rename InputSourceReference->ContentReference

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java

@@ -235,7 +235,7 @@ public FromXmlParser(IOContext ctxt, int genericParserFeatures, int xmlFeatures,
         _ioContext = ctxt;
         _objectCodec = codec;
         _parsingContext = XmlReadContext.createRootContext(-1, -1);
-        _xmlTokens = new XmlTokenStream(xmlReader, ctxt.sourceReference(),
+        _xmlTokens = new XmlTokenStream(xmlReader, ctxt.contentReference(),
                     _formatFeatures);
 
         final int firstToken;
@@ -1323,7 +1323,7 @@ protected void _handleEOF() throws JsonParseException
             _reportInvalidEOF(String.format(
                     ": expected close marker for %s (start marker at %s)",
                     marker,
-                    _parsingContext.startLocation(_ioContext.sourceReference())),
+                    _parsingContext.startLocation(_ioContext.contentReference())),
                     null);
         }
     }

src/main/java/com/fasterxml/jackson/dataformat/xml/deser/XmlReadContext.java

@@ -4,7 +4,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.io.CharTypes;
-import com.fasterxml.jackson.core.io.InputSourceReference;
+import com.fasterxml.jackson.core.io.ContentReference;
 
 /**
  * Extension of {@link JsonStreamContext}, which implements
@@ -148,7 +148,7 @@ public final XmlReadContext createChildObjectContext(int lineNr, int colNr)
      *   start marker was found
      */
     @Override
-    public final JsonLocation startLocation(InputSourceReference srcRef) {
+    public final JsonLocation startLocation(ContentReference srcRef) {
         // We don't keep track of offsets at this level (only reader does)
         long totalChars = -1L;
 

src/main/java/com/fasterxml/jackson/dataformat/xml/deser/XmlTokenStream.java

@@ -10,7 +10,7 @@
 import org.codehaus.stax2.ri.Stax2ReaderAdapter;
 
 import com.fasterxml.jackson.core.JsonLocation;
-import com.fasterxml.jackson.core.io.InputSourceReference;
+import com.fasterxml.jackson.core.io.ContentReference;
 
 /**
  * Simple helper class used on top of STAX {@link XMLStreamReader} to further
@@ -62,7 +62,7 @@ public class XmlTokenStream
     protected final XMLStreamReader2 _xmlReader;
 
     // @since 2.13 (was untyped before)
-    protected final InputSourceReference _sourceReference;
+    protected final ContentReference _sourceReference;
 
     /**
      * Bit flag composed of bits that indicate which
@@ -150,7 +150,7 @@ public class XmlTokenStream
     /**********************************************************************
      */
 
-    public XmlTokenStream(XMLStreamReader xmlReader, InputSourceReference sourceRef,
+    public XmlTokenStream(XMLStreamReader xmlReader, ContentReference sourceRef,
             int formatFeatures)
     {
         _sourceReference = sourceRef;

src/test/java/com/fasterxml/jackson/dataformat/xml/stream/XmlTokenStreamTest.java

@@ -4,7 +4,7 @@
 
 import javax.xml.stream.*;
 
-import com.fasterxml.jackson.core.io.InputSourceReference;
+import com.fasterxml.jackson.core.io.ContentReference;
 import com.fasterxml.jackson.dataformat.xml.XmlTestBase;
 import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser;
 import com.fasterxml.jackson.dataformat.xml.deser.XmlTokenStream;
@@ -176,7 +176,7 @@ private XmlTokenStream _tokensFor(String doc, int flags) throws Exception
         XMLStreamReader sr = _staxInputFactory.createXMLStreamReader(new StringReader(doc));
         // must point to START_ELEMENT, so:
         sr.nextTag();
-        XmlTokenStream stream = new XmlTokenStream(sr, InputSourceReference.rawSource(doc), flags);
+        XmlTokenStream stream = new XmlTokenStream(sr, ContentReference.rawReference(doc), flags);
         stream.initialize();
         return stream;
     }