Renaming, including for #670 (but also many more)

Author: cowtowncoder

src/main/java/tools/jackson/core/PrettyPrinter.java

@@ -126,7 +126,7 @@ public interface PrettyPrinter
      * @throws WrappedIOException if there is an underlying I/O problem
      * @throws StreamWriteException for problems in encoding token stream
      */
-    void writeObjectFieldValueSeparator(JsonGenerator g) throws JacksonException;
+    void writeObjectNameValueSeparator(JsonGenerator g) throws JacksonException;
 
     // // // Array handling
 

src/main/java/tools/jackson/core/json/JsonFactory.java

@@ -11,7 +11,7 @@
 import tools.jackson.core.*;
 import tools.jackson.core.base.TextualTSFactory;
 import tools.jackson.core.io.*;
-import tools.jackson.core.json.async.NonBlockingJsonParser;
+import tools.jackson.core.json.async.NonBlockingByteArrayJsonParser;
 import tools.jackson.core.json.async.NonBlockingByteBufferJsonParser;
 import tools.jackson.core.sym.BinaryNameMatcher;
 import tools.jackson.core.sym.ByteQuadsCanonicalizer;
@@ -332,7 +332,7 @@ public JsonParser createNonBlockingByteArrayParser(ObjectReadContext readCtxt)
     {
         IOContext ioCtxt = _createNonBlockingContext(null);
         ByteQuadsCanonicalizer can = _byteSymbolCanonicalizer.makeChild(_factoryFeatures);
-        return new NonBlockingJsonParser(readCtxt, ioCtxt,
+        return new NonBlockingByteArrayJsonParser(readCtxt, ioCtxt,
                 readCtxt.getStreamReadFeatures(_streamReadFeatures),
                 readCtxt.getFormatReadFeatures(_formatReadFeatures),
                 can);

src/main/java/tools/jackson/core/json/JsonGeneratorBase.java

@@ -254,7 +254,7 @@ protected void _verifyPrettyValueWrite(String typeMsg, int status) throws Jackso
             _cfgPrettyPrinter.writeArrayValueSeparator(this);
             break;
         case JsonWriteContext.STATUS_OK_AFTER_COLON:
-            _cfgPrettyPrinter.writeObjectFieldValueSeparator(this);
+            _cfgPrettyPrinter.writeObjectNameValueSeparator(this);
             break;
         case JsonWriteContext.STATUS_OK_AFTER_SPACE:
             _cfgPrettyPrinter.writeRootValueSeparator(this);

src/main/java/tools/jackson/core/json/UTF8DataInputJsonParser.java

@@ -1649,7 +1649,7 @@ protected String _parseAposName() throws IOException
         int currQuad = 0;
         int currQuadBytes = 0;
 
-        // Copied from parseEscapedFieldName, with minor mods:
+        // Copied from parseEscapedName, with minor mods:
 
         final int[] codes = _icLatin1;
 

src/main/java/tools/jackson/core/json/UTF8StreamJsonParser.java

@@ -2522,7 +2522,7 @@ protected String _parseAposName() throws JacksonException
         int currQuad = 0;
         int currQuadBytes = 0;
 
-        // Copied from parseEscapedFieldName, with minor mods:
+        // Copied from parseEscapedName, with minor mods:
 
         final int[] codes = _icLatin1;
 

src/main/java/tools/jackson/core/json/async/NonBlockingJsonParser.java src/main/java/tools/jackson/core/json/async/NonBlockingByteArrayJsonParser.java

@@ -15,13 +15,13 @@
  * NOTE: only supports parsing of UTF-8 encoded content (and 7-bit US-ASCII since
  * it is strict subset of UTF-8): other encodings are not supported.
  */
-public class NonBlockingJsonParser
+public class NonBlockingByteArrayJsonParser
     extends NonBlockingUtf8JsonParserBase
     implements ByteArrayFeeder
 {
     private byte[] _inputBuffer = NO_BYTES;
 
-    public NonBlockingJsonParser(ObjectReadContext readCtxt, IOContext ctxt,
+    public NonBlockingByteArrayJsonParser(ObjectReadContext readCtxt, IOContext ctxt,
             int stdFeatures, int formatReadFeatures, ByteQuadsCanonicalizer sym) {
         super(readCtxt, ctxt, stdFeatures, formatReadFeatures, sym);
     }

src/main/java/tools/jackson/core/json/async/NonBlockingUtf8JsonParserBase.java

@@ -143,9 +143,9 @@ public JsonToken nextToken() throws JacksonException
         case MAJOR_ROOT:
             return _startValue(ch);
 
-        case MAJOR_OBJECT_PROPERTY_FIRST: // expect field-name or end-object
+        case MAJOR_OBJECT_PROPERTY_FIRST: // expect property-name or end-object
             return _startName(ch);
-        case MAJOR_OBJECT_PROPERTY_NEXT: // expect comma + field-name or end-object
+        case MAJOR_OBJECT_PROPERTY_NEXT: // expect comma + property-name or end-object
             return _startNameAfterComma(ch);
 
         case MAJOR_OBJECT_VALUE: // expect colon, followed by value
@@ -202,11 +202,11 @@ protected final JsonToken _finishToken() throws JacksonException
         case MINOR_PROPERTY_LEADING_COMMA:
             return _startNameAfterComma(getNextUnsignedByteFromBuffer());
 
-        // Field name states
+        // Property name states
         case MINOR_PROPERTY_NAME:
             return _parseEscapedName(_quadLength,  _pending32, _pendingBytes);
         case MINOR_PROPERTY_NAME_ESCAPE:
-            return _finishFieldWithEscape();
+            return _finishPropertyWithEscape();
         case MINOR_PROPERTY_APOS_NAME:
             return _finishAposName(_quadLength,  _pending32, _pendingBytes);
         case MINOR_PROPERTY_UNQUOTED_NAME:
@@ -2376,7 +2376,7 @@ private JsonToken _finishAposName(int qlen, int currQuad, int currQuadBytes)
         return _fieldComplete(name);
     }
 
-    protected final JsonToken _finishFieldWithEscape() throws JacksonException
+    protected final JsonToken _finishPropertyWithEscape() throws JacksonException
     {
         // First: try finishing what wasn't yet:
         int ch = _decodeSplitEscaped(_quoted32, _quotedDigits);

src/main/java/tools/jackson/core/util/DefaultPrettyPrinter.java

@@ -81,7 +81,7 @@ public interface Indenter
 
     protected Separators _separators;
 
-    protected String _objectFieldValueSeparatorWithSpaces;
+    protected String _nameValueSeparatorWithSpaces;
 
     /*
     /**********************************************************************
@@ -130,7 +130,7 @@ public DefaultPrettyPrinter(DefaultPrettyPrinter base,
         _nesting = base._nesting;
 
         _separators = base._separators;
-        _objectFieldValueSeparatorWithSpaces = base._objectFieldValueSeparatorWithSpaces;
+        _nameValueSeparatorWithSpaces = base._nameValueSeparatorWithSpaces;
 
         _rootSeparator = rootSeparator;
     }
@@ -228,7 +228,7 @@ protected DefaultPrettyPrinter _withSpaces(boolean state)
      */
     public DefaultPrettyPrinter withSeparators(Separators separators) {
         _separators = separators;
-        _objectFieldValueSeparatorWithSpaces = " " + separators.getObjectNameValueSeparator() + " ";
+        _nameValueSeparatorWithSpaces = " " + separators.getObjectNameValueSeparator() + " ";
         return this;
     }
 
@@ -286,10 +286,10 @@ public void beforeObjectEntries(JsonGenerator g) throws JacksonException
      * (white-space) decoration.
      */
     @Override
-    public void writeObjectFieldValueSeparator(JsonGenerator g) throws JacksonException
+    public void writeObjectNameValueSeparator(JsonGenerator g) throws JacksonException
     {
         if (_spacesInObjectEntries) {
-            g.writeRaw(_objectFieldValueSeparatorWithSpaces);
+            g.writeRaw(_nameValueSeparatorWithSpaces);
         } else {
             g.writeRaw(_separators.getObjectNameValueSeparator());
         }

src/main/java/tools/jackson/core/util/MinimalPrettyPrinter.java

@@ -93,7 +93,7 @@ public void beforeObjectEntries(JsonGenerator g) throws JacksonException
      * colon to separate the two, without additional spaces.
      */
     @Override
-    public void writeObjectFieldValueSeparator(JsonGenerator g) throws JacksonException
+    public void writeObjectNameValueSeparator(JsonGenerator g) throws JacksonException
     {
         g.writeRaw(_separators.getObjectNameValueSeparator());
     }

src/main/java/tools/jackson/core/util/Separators.java

@@ -25,14 +25,14 @@ public Separators() {
         this(':', ',', ',');
     }
 
-    public Separators(char objectFieldValueSeparator,
+    public Separators(char objectNameValueSeparator,
             char objectEntrySeparator, char arrayValueSeparator) {
-        _objectNameValueSeparator = objectFieldValueSeparator;
+        _objectNameValueSeparator = objectNameValueSeparator;
         _objectEntrySeparator = objectEntrySeparator;
         _arrayElementSeparator = arrayValueSeparator;
     }
-    
-    public Separators withObjectFieldValueSeparator(char sep) {
+
+    public Separators withObjectNameValueSeparator(char sep) {
         return (_objectNameValueSeparator == sep) ? this
                 : new Separators(sep, _objectEntrySeparator, _arrayElementSeparator);
     }

src/test/java/tools/jackson/core/BaseTest.java

@@ -521,6 +521,7 @@ protected String getAndVerifyText(JsonParser p)
     /**********************************************************************
      */
 
+    @Deprecated
     protected static String quote(String str) {
         return q(str);
     }
@@ -529,6 +530,7 @@ protected static String q(String str) {
         return '"'+str+'"';
     }
 
+    @Deprecated
     protected static String aposToQuotes(String json) {
         return a2q(json);
     }

src/test/java/tools/jackson/core/PointerFromContextTest.java

@@ -16,7 +16,7 @@ public class PointerFromContextTest extends BaseTest
 
     public void testViaParser() throws Exception
     {
-        final String SIMPLE = aposToQuotes("{'a':123,'array':[1,2,[3],5,{'obInArray':4}],"
+        final String SIMPLE = a2q("{'a':123,'array':[1,2,[3],5,{'obInArray':4}],"
                 +"'ob':{'first':[false,true],'second':{'sub':37}},'b':true}");
         JsonParser p = JSON_F.createParser(ObjectReadContext.empty(), SIMPLE);
 
@@ -145,7 +145,7 @@ public void testViaGenerator() throws Exception
 
     public void testParserWithRoot() throws Exception
     {
-        final String JSON = aposToQuotes("{'a':1,'b':3}\n"
+        final String JSON = a2q("{'a':1,'b':3}\n"
                 +"{'a':5,'c':[1,2]}\n[1,2]\n");
         JsonParser p = JSON_F.createParser(ObjectReadContext.empty(), JSON);
         // before pointing to anything, we have no path to point to

src/test/java/tools/jackson/core/base64/Base64BinaryParsingTest.java

@@ -87,7 +87,7 @@ public void testInvalidChar()
         for (int mode : ALL_MODES) {
 
             // First: illegal padding
-            JsonParser p = createParser(mode, quote("a==="));
+            JsonParser p = createParser(mode, q("a==="));
             assertToken(JsonToken.VALUE_STRING, p.nextToken());
             try {
                 p.getBinaryValue(Base64Variants.MIME);
@@ -98,7 +98,7 @@ public void testInvalidChar()
             p.close();
 
             // second: invalid space within
-            p = createParser(mode, quote("ab de"));
+            p = createParser(mode, q("ab de"));
             assertToken(JsonToken.VALUE_STRING, p.nextToken());
             try {
                 p.getBinaryValue(Base64Variants.MIME);
@@ -109,7 +109,7 @@ public void testInvalidChar()
             p.close();
 
             // third: something else
-            p = createParser(mode, quote("ab#?"));
+            p = createParser(mode, q("ab#?"));
             assertToken(JsonToken.VALUE_STRING, p.nextToken());
             try {
                 p.getBinaryValue(Base64Variants.MIME);
@@ -139,7 +139,7 @@ private void _testOkMissingPadding(byte[] input, int mode)
     {
         final Base64Variant b64 = Base64Variants.MODIFIED_FOR_URL;
         final String encoded = b64.encode(input, false);
-        JsonParser p = createParser(mode, quote(encoded));
+        JsonParser p = createParser(mode, q(encoded));
         // 1 byte -> 2 encoded chars; 2 bytes -> 3 encoded chars
         assertEquals(input.length+1, encoded.length());
         assertToken(JsonToken.VALUE_STRING, p.nextToken());
@@ -149,13 +149,13 @@ private void _testOkMissingPadding(byte[] input, int mode)
     }
 
     public void testFailDueToMissingPadding() {
-        final String DOC1 = quote("fQ"); // 1 bytes, no padding
+        final String DOC1 = q("fQ"); // 1 bytes, no padding
         _testFailDueToMissingPadding(DOC1, MODE_INPUT_STREAM);
         _testFailDueToMissingPadding(DOC1, MODE_INPUT_STREAM_THROTTLED);
         _testFailDueToMissingPadding(DOC1, MODE_READER);
         _testFailDueToMissingPadding(DOC1, MODE_DATA_INPUT);
 
-        final String DOC2 = quote("A/A"); // 2 bytes, no padding
+        final String DOC2 = q("A/A"); // 2 bytes, no padding
         _testFailDueToMissingPadding(DOC2, MODE_INPUT_STREAM);
         _testFailDueToMissingPadding(DOC2, MODE_INPUT_STREAM_THROTTLED);
         _testFailDueToMissingPadding(DOC2, MODE_READER);
@@ -396,7 +396,7 @@ private void _testEscaped(int mode) throws IOException
 
         // First, try with embedded linefeed half-way through:
 
-        String DOC = quote("VGVz\\ndCE="); // note: must double-quote to get linefeed
+        String DOC = q("VGVz\\ndCE="); // note: must double-quote to get linefeed
         JsonParser p = createParser(mode, DOC);
         assertToken(JsonToken.VALUE_STRING, p.nextToken());
         byte[] b = p.getBinaryValue();
@@ -408,7 +408,7 @@ private void _testEscaped(int mode) throws IOException
 
         // and then with escaped chars
 //            DOC = quote("V\\u0047V\\u007AdCE="); // note: must escape backslash...
-        DOC = quote("V\\u0047V\\u007AdCE="); // note: must escape backslash...
+        DOC = q("V\\u0047V\\u007AdCE="); // note: must escape backslash...
         p = createParser(mode, DOC);
         assertToken(JsonToken.VALUE_STRING, p.nextToken());
         b = p.getBinaryValue();
@@ -422,7 +422,7 @@ private void _testEscaped(int mode) throws IOException
     private void _testEscapedPadding(int mode) throws IOException
     {
         // Input: "Test!" -> "VGVzdCE="
-        final String DOC = quote("VGVzdCE\\u003d");
+        final String DOC = q("VGVzdCE\\u003d");
 
         // 06-Sep-2018, tatu: actually one more, test escaping of padding
         JsonParser p = createParser(mode, DOC);
@@ -443,7 +443,7 @@ private void _testEscapedPadding(int mode) throws IOException
         p.close();
 
         // and then different padding; "X" -> "WA=="
-        final String DOC2 = quote("WA\\u003D\\u003D");
+        final String DOC2 = q("WA\\u003D\\u003D");
         p = createParser(mode, DOC2);
         assertToken(JsonToken.VALUE_STRING, p.nextToken());
         assertEquals("X", new String(p.getBinaryValue(), "US-ASCII"));

src/test/java/tools/jackson/core/base64/Base64CodecTest.java

@@ -85,7 +85,7 @@ public void testConvenienceMethods() throws Exception
         byte[] decoded = std.decode(encoded);
         Assert.assertArrayEquals(input, decoded);
 
-        assertEquals(quote(encoded), std.encode(input, true));
+        assertEquals(q(encoded), std.encode(input, true));
 
         // [core#414]: check white-space allow too
         decoded = std.decode("\n"+encoded);

src/test/java/tools/jackson/core/base64/Base64GenerationTest.java

@@ -100,13 +100,13 @@ public void testBinaryAsEmbeddedObject() throws Exception
         g = JSON_F.createGenerator(ObjectWriteContext.empty(), sw);
         g.writeEmbeddedObject(WIKIPEDIA_BASE64_AS_BYTES);
         g.close();
-        assertEquals(quote(WIKIPEDIA_BASE64_ENCODED), sw.toString());
+        assertEquals(q(WIKIPEDIA_BASE64_ENCODED), sw.toString());
 
         ByteArrayOutputStream bytes =  new ByteArrayOutputStream(100);
         g = JSON_F.createGenerator(ObjectWriteContext.empty(), bytes);
         g.writeEmbeddedObject(WIKIPEDIA_BASE64_AS_BYTES);
         g.close();
-        assertEquals(quote(WIKIPEDIA_BASE64_ENCODED), bytes.toString("UTF-8"));
+        assertEquals(q(WIKIPEDIA_BASE64_ENCODED), bytes.toString("UTF-8"));
     }
 
     /*
@@ -180,7 +180,7 @@ private void _testStreamingWrites(JsonFactory jf, boolean useBytes) throws Excep
     {
         final byte[] INPUT = TEXT4.getBytes("UTF-8");
         for (Base64Variant variant : VARIANTS) {
-            final String EXP_OUTPUT = "[" + quote(variant.encode(INPUT))+"]";
+            final String EXP_OUTPUT = "[" + q(variant.encode(INPUT))+"]";
             for (boolean passLength : new boolean[] { true, false }) {
                 for (int chunkSize : new int[] { 1, 2, 3, 4, 7, 11, 29, 5000 }) {
 //System.err.println(""+variant+", length "+passLength+", chunk "+chunkSize);

src/test/java/tools/jackson/core/filter/BasicGeneratorFilteringTest.java

@@ -247,7 +247,7 @@ public void testSingleMatchFilteringWithPathSkippedArray() throws Exception
         assertEquals(1, gen.getMatchCount());
     }
 
-    // Alternative take, using slightly different calls for FIELD_NAME, START_ARRAY
+    // Alternative take, using slightly different calls for PROPERTY_NAME, START_ARRAY
     public void testSingleMatchFilteringWithPathAlternate1() throws Exception {
         _testSingleMatchFilteringWithPathAlternate1(false);
         _testSingleMatchFilteringWithPathAlternate1(true);

src/test/java/tools/jackson/core/filter/BasicParserFilteringTest.java

@@ -459,15 +459,15 @@ public void testNoMatchFiltering6() throws Exception
 
     public void testValueOmitsFieldName1() throws Exception
     {
-        String jsonString = aposToQuotes("{'a':123,'array':[1,2]}");
+        String jsonString = a2q("{'a':123,'array':[1,2]}");
         JsonParser p0 = JSON_F.createParser(ObjectReadContext.empty(), jsonString);
         FilteringParserDelegate p = new FilteringParserDelegate(p0,
             new NoArraysFilter(),
             Inclusion.INCLUDE_NON_NULL,
             true // multipleMatches
         );
         String result = readAndWrite(JSON_F, p);
-        assertEquals(aposToQuotes("{'a':123}"), result);
+        assertEquals(a2q("{'a':123}"), result);
         assertEquals(1, p.getMatchCount());
     }
 

src/test/java/tools/jackson/core/filter/JsonPointerGeneratorFilteringTest.java

@@ -11,7 +11,7 @@ public class JsonPointerGeneratorFilteringTest extends tools.jackson.core.BaseTe
 {
     private final JsonFactory JSON_F = new JsonFactory();
 
-    final String SIMPLE_INPUT = aposToQuotes("{'a':1,'b':[1,2,3],'c':{'d':{'a':true}},'d':null}");
+    final String SIMPLE_INPUT = a2q("{'a':1,'b':[1,2,3],'c':{'d':{'a':true}},'d':null}");
 
     public void testSimplePropertyWithPath() throws Exception
     {
@@ -108,7 +108,7 @@ private void _assert(String input, String pathExpr, Inclusion tokenFilterInclusi
             throw e;
         }
 
-        assertEquals(aposToQuotes(exp), w.toString());
+        assertEquals(a2q(exp), w.toString());
     }
 
 

src/test/java/tools/jackson/core/filter/JsonPointerParserFilteringTest.java

@@ -10,9 +10,9 @@ public class JsonPointerParserFilteringTest extends tools.jackson.core.BaseTest
 {
     private final JsonFactory JSON_F = new JsonFactory();
 
-    final String SIMPLEST_INPUT = aposToQuotes("{'a':1,'b':2,'c':3}");
+    final String SIMPLEST_INPUT = a2q("{'a':1,'b':2,'c':3}");
 
-    final String SIMPLE_INPUT = aposToQuotes("{'a':1,'b':[1,2,3],'c':{'d':{'a':true}},'d':null}");
+    final String SIMPLE_INPUT = a2q("{'a':1,'b':[1,2,3],'c':{'d':{'a':true}},'d':null}");
 
     public void testSimplestWithPath() throws Exception
     {
@@ -80,6 +80,6 @@ void _assert(String input, String pathExpr, TokenFilter.Inclusion inclusion, Str
             throw e;
         }
 
-        assertEquals(aposToQuotes(exp), w.toString());
+        assertEquals(a2q(exp), w.toString());
     }
 }