Renaming of InputSourceReference->ContentReference

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/std/JsonLocationInstantiator.java

@@ -1,7 +1,7 @@
 package com.fasterxml.jackson.databind.deser.std;
 
 import com.fasterxml.jackson.core.JsonLocation;
-import com.fasterxml.jackson.core.io.InputSourceReference;
+import com.fasterxml.jackson.core.io.ContentReference;
 import com.fasterxml.jackson.databind.DeserializationConfig;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JavaType;
@@ -53,7 +53,7 @@ public Object createFromObjectWith(DeserializationContext ctxt, Object[] args) {
         // 14-Mar-2021, tatu: Before 2.13 constructor directly took "raw" source ref;
         //   with 2.13 changed to use `InputSourceReference`... left almost as is,
         //   for compatibility.
-        final InputSourceReference srcRef = InputSourceReference.rawSource(args[0]);
+        final ContentReference srcRef = ContentReference.rawReference(args[0]);
         return new JsonLocation(srcRef, _long(args[1]), _long(args[2]),
                 _int(args[3]), _int(args[4]));
     }

src/main/java/com/fasterxml/jackson/databind/util/TokenBufferReadContext.java

@@ -1,7 +1,7 @@
 package com.fasterxml.jackson.databind.util;
 
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.InputSourceReference;
+import com.fasterxml.jackson.core.io.ContentReference;
 import com.fasterxml.jackson.core.json.JsonReadContext;
 
 /**
@@ -34,7 +34,7 @@ public class TokenBufferReadContext extends JsonStreamContext
     /**
      * @since 2.13
      */
-    protected TokenBufferReadContext(JsonStreamContext base, InputSourceReference srcRef)
+    protected TokenBufferReadContext(JsonStreamContext base, ContentReference srcRef)
     {
         super(base);
         _parent = base.getParent();
@@ -50,9 +50,9 @@ protected TokenBufferReadContext(JsonStreamContext base, InputSourceReference sr
 
     @Deprecated // @since 2.13
     protected TokenBufferReadContext(JsonStreamContext base, Object srcRef) {
-        this(base, (srcRef instanceof InputSourceReference) ?
-                (InputSourceReference) srcRef :
-                    InputSourceReference.rawSource(srcRef));
+        this(base, (srcRef instanceof ContentReference) ?
+                (ContentReference) srcRef :
+                    ContentReference.rawReference(srcRef));
     }
 
     protected TokenBufferReadContext(JsonStreamContext base, JsonLocation startLoc) {
@@ -100,7 +100,7 @@ public static TokenBufferReadContext createRootContext(JsonStreamContext origCon
         if (origContext == null) {
             return new TokenBufferReadContext();
         }
-        return new TokenBufferReadContext(origContext, InputSourceReference.unknown());
+        return new TokenBufferReadContext(origContext, ContentReference.unknown());
     }
 
     public TokenBufferReadContext createChildArrayContext() {

src/test/java/com/fasterxml/jackson/databind/deser/TestJacksonTypes.java

@@ -3,7 +3,7 @@
 import java.util.*;
 
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.InputSourceReference;
+import com.fasterxml.jackson.core.io.ContentReference;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.fasterxml.jackson.databind.util.TokenBuffer;
@@ -19,7 +19,7 @@ public class TestJacksonTypes
     public void testJsonLocation() throws Exception
     {
         // note: source reference is untyped, only String guaranteed to work
-        JsonLocation loc = new JsonLocation(InputSourceReference.rawSource("whatever"),
+        JsonLocation loc = new JsonLocation(ContentReference.rawReference("whatever"),
                 -1, -1, 100, 13);
         // Let's use serializer here; goal is round-tripping
         String ser = MAPPER.writerWithDefaultPrettyPrinter()

src/test/java/com/fasterxml/jackson/databind/ser/TestJacksonTypes.java

@@ -4,7 +4,7 @@
 import java.util.*;
 
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.InputSourceReference;
+import com.fasterxml.jackson.core.io.ContentReference;
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.util.TokenBuffer;
@@ -18,7 +18,7 @@ public class TestJacksonTypes
     public void testLocation() throws IOException
     {
         File f = new File("/tmp/test.json");
-        JsonLocation loc = new JsonLocation(InputSourceReference.rawSource(f),
+        JsonLocation loc = new JsonLocation(ContentReference.rawReference(f),
                 -1, 100, 13);
         ObjectMapper mapper = new ObjectMapper();
         Map<String,Object> result = writeAndMap(mapper, loc);