Merge pull request #237 from DevFactory/release/static-final-arrays-should-be-private-fix-1
Code quality fix - Static final arrays should be "private"
diff --git a/src/main/java/com/fasterxml/jackson/core/base/ParserBase.java b/src/main/java/com/fasterxml/jackson/core/base/ParserBase.java
index 60c577a..b5112a2 100644
--- a/src/main/java/com/fasterxml/jackson/core/base/ParserBase.java
+++ b/src/main/java/com/fasterxml/jackson/core/base/ParserBase.java
@@ -50,12 +50,12 @@
/**
* Pointer to next available character in buffer
*/
- protected int _inputPtr = 0;
+ protected int _inputPtr;
/**
* Index of character after last available one in the buffer.
*/
- protected int _inputEnd = 0;
+ protected int _inputEnd;
/*
/**********************************************************
@@ -67,7 +67,7 @@
* Number of characters/bytes that were contained in previous blocks
* (blocks that were already processed prior to the current buffer).
*/
- protected long _currInputProcessed = 0L;
+ protected long _currInputProcessed;
/**
* Current row location of current point in input buffer, starting
@@ -81,7 +81,7 @@
* of not having column itself is that this only has to be updated
* once per line.
*/
- protected int _currInputRowStart = 0;
+ protected int _currInputRowStart;
/*
/**********************************************************
@@ -97,7 +97,7 @@
* For big (gigabyte-sized) sizes are possible, needs to be long,
* unlike pointers and sizes related to in-memory buffers.
*/
- protected long _tokenInputTotal = 0;
+ protected long _tokenInputTotal;
/**
* Input row on which current token starts, 1-based
@@ -108,7 +108,7 @@
* Column on input row that current token starts; 0-based (although
* in the end it'll be converted to 1-based)
*/
- protected int _tokenInputCol = 0;
+ protected int _tokenInputCol;
/*
/**********************************************************
@@ -147,20 +147,20 @@
* using {@link #getTextCharacters} method (instead of String
* returning alternatives)
*/
- protected char[] _nameCopyBuffer = null;
+ protected char[] _nameCopyBuffer;
/**
* Flag set to indicate whether the field name is available
* from the name copy buffer or not (in addition to its String
* representation being available via read context)
*/
- protected boolean _nameCopied = false;
+ protected boolean _nameCopied;
/**
* ByteArrayBuilder is needed if 'getBinaryValue' is called. If so,
* we better reuse it for remainder of content.
*/
- protected ByteArrayBuilder _byteArrayBuilder = null;
+ protected ByteArrayBuilder _byteArrayBuilder;
/**
* We will hold on to decoded binary data, for duration of
diff --git a/src/main/java/com/fasterxml/jackson/core/filter/FilteringGeneratorDelegate.java b/src/main/java/com/fasterxml/jackson/core/filter/FilteringGeneratorDelegate.java
index 8468a37..1c7bed3 100644
--- a/src/main/java/com/fasterxml/jackson/core/filter/FilteringGeneratorDelegate.java
+++ b/src/main/java/com/fasterxml/jackson/core/filter/FilteringGeneratorDelegate.java
@@ -55,7 +55,7 @@
* Marked as deprecated since its status is uncertain.
*/
@Deprecated
- protected boolean _includeImmediateParent = false;
+ protected boolean _includeImmediateParent;
/*
/**********************************************************
diff --git a/src/main/java/com/fasterxml/jackson/core/filter/FilteringParserDelegate.java b/src/main/java/com/fasterxml/jackson/core/filter/FilteringParserDelegate.java
index 0d65bff..7900229 100644
--- a/src/main/java/com/fasterxml/jackson/core/filter/FilteringParserDelegate.java
+++ b/src/main/java/com/fasterxml/jackson/core/filter/FilteringParserDelegate.java
@@ -57,7 +57,7 @@
* Marked as deprecated since its status is uncertain.
*/
@Deprecated
- protected boolean _includeImmediateParent = false;
+ protected boolean _includeImmediateParent;
/*
/**********************************************************
diff --git a/src/main/java/com/fasterxml/jackson/core/filter/TokenFilterContext.java b/src/main/java/com/fasterxml/jackson/core/filter/TokenFilterContext.java
index fcca317..14848bb 100644
--- a/src/main/java/com/fasterxml/jackson/core/filter/TokenFilterContext.java
+++ b/src/main/java/com/fasterxml/jackson/core/filter/TokenFilterContext.java
@@ -25,7 +25,7 @@
/**********************************************************
*/
- protected TokenFilterContext _child = null;
+ protected TokenFilterContext _child;
/*
/**********************************************************
diff --git a/src/main/java/com/fasterxml/jackson/core/io/IOContext.java b/src/main/java/com/fasterxml/jackson/core/io/IOContext.java
index 84fefc1..a4675be 100644
--- a/src/main/java/com/fasterxml/jackson/core/io/IOContext.java
+++ b/src/main/java/com/fasterxml/jackson/core/io/IOContext.java
@@ -56,33 +56,33 @@
* Reference to the allocated I/O buffer for low-level input reading,
* if any allocated.
*/
- protected byte[] _readIOBuffer = null;
+ protected byte[] _readIOBuffer;
/**
* Reference to the allocated I/O buffer used for low-level
* encoding-related buffering.
*/
- protected byte[] _writeEncodingBuffer = null;
+ protected byte[] _writeEncodingBuffer;
/**
* Reference to the buffer allocated for temporary use with
* base64 encoding or decoding.
*/
- protected byte[] _base64Buffer = null;
+ protected byte[] _base64Buffer;
/**
* Reference to the buffer allocated for tokenization purposes,
* in which character input is read, and from which it can be
* further returned.
*/
- protected char[] _tokenCBuffer = null;
+ protected char[] _tokenCBuffer;
/**
* Reference to the buffer allocated for buffering it for
* output, before being encoded: generally this means concatenating
* output, then encoding when buffer fills up.
*/
- protected char[] _concatCBuffer = null;
+ protected char[] _concatCBuffer;
/**
* Reference temporary buffer Parser instances need if calling
@@ -90,7 +90,7 @@
* Regular text buffer can not be used as it may contain textual
* representation of the value token.
*/
- protected char[] _nameCopyBuffer = null;
+ protected char[] _nameCopyBuffer;
/*
/**********************************************************
diff --git a/src/main/java/com/fasterxml/jackson/core/io/UTF32Reader.java b/src/main/java/com/fasterxml/jackson/core/io/UTF32Reader.java
index 787b3ad..34b126c 100644
--- a/src/main/java/com/fasterxml/jackson/core/io/UTF32Reader.java
+++ b/src/main/java/com/fasterxml/jackson/core/io/UTF32Reader.java
@@ -39,12 +39,12 @@
/**
* Total read character count; used for error reporting purposes
*/
- protected int _charCount = 0;
+ protected int _charCount;
/**
* Total read byte count; used for error reporting purposes
*/
- protected int _byteCount = 0;
+ protected int _byteCount;
protected final boolean _managedBuffers;
@@ -81,7 +81,7 @@
}
}
- protected char[] _tmpBuf = null;
+ protected char[] _tmpBuf;
/**
* Although this method is implemented by the base class, AND it should
diff --git a/src/main/java/com/fasterxml/jackson/core/io/UTF8Writer.java b/src/main/java/com/fasterxml/jackson/core/io/UTF8Writer.java
index ab358d9..3672f88 100644
--- a/src/main/java/com/fasterxml/jackson/core/io/UTF8Writer.java
+++ b/src/main/java/com/fasterxml/jackson/core/io/UTF8Writer.java
@@ -24,7 +24,7 @@
* To do this, both pairs must be known first; and since it is possible
* pairs may be split, we need temporary storage for the first half
*/
- private int _surrogate = 0;
+ private int _surrogate;
public UTF8Writer(IOContext ctxt, OutputStream out)
{
diff --git a/src/main/java/com/fasterxml/jackson/core/json/ByteSourceJsonBootstrapper.java b/src/main/java/com/fasterxml/jackson/core/json/ByteSourceJsonBootstrapper.java
index f59e032..d37079b 100644
--- a/src/main/java/com/fasterxml/jackson/core/json/ByteSourceJsonBootstrapper.java
+++ b/src/main/java/com/fasterxml/jackson/core/json/ByteSourceJsonBootstrapper.java
@@ -73,7 +73,7 @@
protected boolean _bigEndian = true;
- protected int _bytesPerChar = 0; // 0 means "dunno yet"
+ protected int _bytesPerChar; // 0 means "dunno yet"
/*
/**********************************************************
diff --git a/src/main/java/com/fasterxml/jackson/core/json/JsonGeneratorImpl.java b/src/main/java/com/fasterxml/jackson/core/json/JsonGeneratorImpl.java
index 9ce93e4..c09d2cf 100644
--- a/src/main/java/com/fasterxml/jackson/core/json/JsonGeneratorImpl.java
+++ b/src/main/java/com/fasterxml/jackson/core/json/JsonGeneratorImpl.java
@@ -95,7 +95,8 @@
super(features, codec);
_ioContext = ctxt;
if (isEnabled(Feature.ESCAPE_NON_ASCII)) {
- setHighestNonEscapedChar(127);
+ // inlined `setHighestNonEscapedChar()`
+ _maximumNonEscapedChar = 127;
}
}
diff --git a/src/main/java/com/fasterxml/jackson/core/json/JsonReadContext.java b/src/main/java/com/fasterxml/jackson/core/json/JsonReadContext.java
index 4d28876..4bb7720 100644
--- a/src/main/java/com/fasterxml/jackson/core/json/JsonReadContext.java
+++ b/src/main/java/com/fasterxml/jackson/core/json/JsonReadContext.java
@@ -30,7 +30,7 @@
/**********************************************************
*/
- protected JsonReadContext _child = null;
+ protected JsonReadContext _child;
/*
/**********************************************************
diff --git a/src/main/java/com/fasterxml/jackson/core/json/JsonWriteContext.java b/src/main/java/com/fasterxml/jackson/core/json/JsonWriteContext.java
index 6b821f3..6212d97 100644
--- a/src/main/java/com/fasterxml/jackson/core/json/JsonWriteContext.java
+++ b/src/main/java/com/fasterxml/jackson/core/json/JsonWriteContext.java
@@ -35,7 +35,7 @@
/**********************************************************
*/
- protected JsonWriteContext _child = null;
+ protected JsonWriteContext _child;
/*
/**********************************************************
diff --git a/src/main/java/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.java b/src/main/java/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.java
index cf0f81e..4348e3f 100644
--- a/src/main/java/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.java
+++ b/src/main/java/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.java
@@ -74,7 +74,7 @@
* been fully processed, and needs to be finished for
* some access (or skipped to obtain the next token)
*/
- protected boolean _tokenIncomplete = false;
+ protected boolean _tokenIncomplete;
/**
* Value of {@link #_inputPtr} at the time when the first character of
diff --git a/src/main/java/com/fasterxml/jackson/core/json/UTF8JsonGenerator.java b/src/main/java/com/fasterxml/jackson/core/json/UTF8JsonGenerator.java
index ae4adeb..48ccac1 100644
--- a/src/main/java/com/fasterxml/jackson/core/json/UTF8JsonGenerator.java
+++ b/src/main/java/com/fasterxml/jackson/core/json/UTF8JsonGenerator.java
@@ -54,7 +54,7 @@
* Pointer to the position right beyond the last character to output
* (end marker; may be past the buffer)
*/
- protected int _outputTail = 0;
+ protected int _outputTail;
/**
* End marker of the output buffer; one past the last valid position
diff --git a/src/main/java/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java b/src/main/java/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java
index 30286bf..4911796 100644
--- a/src/main/java/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java
+++ b/src/main/java/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java
@@ -64,7 +64,7 @@
* been fully processed, and needs to be finished for
* some access (or skipped to obtain the next token)
*/
- protected boolean _tokenIncomplete = false;
+ protected boolean _tokenIncomplete;
/**
* Temporary storage for partially parsed name bytes.
diff --git a/src/main/java/com/fasterxml/jackson/core/json/WriterBasedJsonGenerator.java b/src/main/java/com/fasterxml/jackson/core/json/WriterBasedJsonGenerator.java
index 4e91969..05dd163 100644
--- a/src/main/java/com/fasterxml/jackson/core/json/WriterBasedJsonGenerator.java
+++ b/src/main/java/com/fasterxml/jackson/core/json/WriterBasedJsonGenerator.java
@@ -35,13 +35,13 @@
/**
* Pointer to the first buffered character to output
*/
- protected int _outputHead = 0;
+ protected int _outputHead;
/**
* Pointer to the position right beyond the last character to output
* (end marker; may point to position right beyond the end of the buffer)
*/
- protected int _outputTail = 0;
+ protected int _outputTail;
/**
* End marker of the output buffer; one past the last valid position
diff --git a/src/main/java/com/fasterxml/jackson/core/util/DefaultPrettyPrinter.java b/src/main/java/com/fasterxml/jackson/core/util/DefaultPrettyPrinter.java
index 70abfaf..510d2fd 100644
--- a/src/main/java/com/fasterxml/jackson/core/util/DefaultPrettyPrinter.java
+++ b/src/main/java/com/fasterxml/jackson/core/util/DefaultPrettyPrinter.java
@@ -79,7 +79,7 @@
* Number of open levels of nesting. Used to determine amount of
* indentation to use.
*/
- protected transient int _nesting = 0;
+ protected transient int _nesting;
/*
/**********************************************************
diff --git a/src/main/java/com/fasterxml/jackson/core/util/TextBuffer.java b/src/main/java/com/fasterxml/jackson/core/util/TextBuffer.java
index 68ba240..85250b1 100644
--- a/src/main/java/com/fasterxml/jackson/core/util/TextBuffer.java
+++ b/src/main/java/com/fasterxml/jackson/core/util/TextBuffer.java
@@ -82,7 +82,7 @@
/**
* Flag that indicates whether _seqments is non-empty
*/
- private boolean _hasSegments = false;
+ private boolean _hasSegments;
// // // Currently used segment; not (yet) contained in _seqments