Warnings removal (synth accessor for private members [usually from static method])

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/core/io/CharTypes.java

@@ -4,8 +4,8 @@
 
 public final class CharTypes
 {
-    private final static char[] HC = "0123456789ABCDEF".toCharArray();
-    private final static byte[] HB;
+    protected final static char[] HC = "0123456789ABCDEF".toCharArray();
+    protected final static byte[] HB;
     static {
         int len = HC.length;
         HB = new byte[len];
@@ -19,7 +19,7 @@ public final class CharTypes
      * Lookup table used for determining which input characters
      * need special handling when contained in text segment.
      */
-    private final static int[] sInputCodes;
+    protected final static int[] sInputCodes;
     static {
         /* 96 would do for most cases (backslash is ASCII 94)
          * but if we want to do lookups by raw bytes it's better
@@ -40,7 +40,7 @@ public final class CharTypes
      * Additionally we can combine UTF-8 decoding info into similar
      * data table.
      */
-    private final static int[] sInputCodesUTF8;
+    protected final static int[] sInputCodesUTF8;
     static {
         final int[] table = new int[sInputCodes.length];
         System.arraycopy(sInputCodes, 0, table, 0, table.length);
@@ -70,7 +70,7 @@ public final class CharTypes
      * Basically this is list of 8-bit ASCII characters that are legal
      * as part of Javascript identifier
      */
-    private final static int[] sInputCodesJsNames;
+    protected final static int[] sInputCodesJsNames;
     static {
         final int[] table = new int[256];
         // Default is "not a name char", mark ones that are
@@ -97,7 +97,7 @@ public final class CharTypes
      * code as ok. They will be validated at a later point, when decoding
      * name
      */
-    private final static int[] sInputCodesUtf8JsNames;
+    protected final static int[] sInputCodesUtf8JsNames;
     static {
         final int[] table = new int[256];
         // start with 8-bit JS names
@@ -110,7 +110,7 @@ public final class CharTypes
      * Decoding table used to quickly determine characters that are
      * relevant within comment content.
      */
-    private final static int[] sInputCodesComment;
+    protected final static int[] sInputCodesComment;
     static {
         final int[] buf = new int[256];
         // but first: let's start with UTF-8 multi-byte markers:
@@ -130,7 +130,7 @@ public final class CharTypes
      * 
      * @since 2.3
      */
-    private final static int[] sInputCodesWS;
+    protected final static int[] sInputCodesWS;
     static {
         // but first: let's start with UTF-8 multi-byte markers:
         final int[] buf = new int[256];
@@ -153,7 +153,7 @@ public final class CharTypes
      * Lookup table used for determining which output characters in
      * 7-bit ASCII range need to be quoted.
      */
-    private final static int[] sOutputEscapes128;
+    protected final static int[] sOutputEscapes128;
     static {
         int[] table = new int[128];
         // Control chars need generic escape sequence
@@ -180,7 +180,7 @@ public final class CharTypes
      *<p>
      * NOTE: before 2.10.1, was of size 128, extended for simpler handling
      */
-    private final static int[] sHexValues = new int[256];
+    protected final static int[] sHexValues = new int[256];
     static {
         Arrays.fill(sHexValues, -1);
         for (int i = 0; i < 10; ++i) {

src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer.java

@@ -67,15 +67,15 @@ public final class ByteQuadsCanonicalizer
      * Reference to the root symbol table, for child tables, so
      * that they can merge table information back as necessary.
      */
-    final private ByteQuadsCanonicalizer _parent;
+    final protected ByteQuadsCanonicalizer _parent;
 
     /**
      * Member that is only used by the root table instance: root
      * passes immutable state info child instances, and children
      * may return new state if they add entries to the table.
      * Child tables do NOT use the reference.
      */
-    final private AtomicReference<TableInfo> _tableInfo;
+    final protected AtomicReference<TableInfo> _tableInfo;
 
     /**
      * Seed value we use as the base to make hash codes non-static between
@@ -84,7 +84,7 @@ public final class ByteQuadsCanonicalizer
      * This is done for security reasons, to avoid potential DoS attack via
      * hash collisions.
      */
-    final private int _seed;
+    final protected int _seed;
 
     /*
     /**********************************************************
@@ -99,15 +99,15 @@ public final class ByteQuadsCanonicalizer
      * NOTE: non-final to allow disabling intern()ing in case of excessive
      * collisions.
      */
-    private boolean _intern;
+    protected boolean _intern;
 
     /**
      * Flag that indicates whether we should throw an exception if enough 
      * hash collisions are detected (true); or just worked around (false).
      * 
      * @since 2.4
      */
-    private final boolean _failOnDoS;
+    protected final boolean _failOnDoS;
 
     /*
     /**********************************************************
@@ -121,25 +121,25 @@ public final class ByteQuadsCanonicalizer
      * structure (details of which may be tweaked depending on expected rates
      * of collisions).
      */
-    private int[] _hashArea;
+    protected int[] _hashArea;
 
     /**
      * Number of slots for primary entries within {@link #_hashArea}; which is
      * at most <code>1/8</code> of actual size of the underlying array (4-int slots,
      * primary covers only half of the area; plus, additional area for longer
      * symbols after hash area).
      */
-    private int _hashSize;
+    protected int _hashSize;
 
     /**
      * Offset within {@link #_hashArea} where secondary entries start
      */
-    private int _secondaryStart;
+    protected int _secondaryStart;
 
     /**
      * Offset within {@link #_hashArea} where tertiary entries start
      */
-    private int _tertiaryStart;
+    protected int _tertiaryStart;
 
     /**
      * Constant that determines size of buckets for tertiary entries:
@@ -150,20 +150,20 @@ public final class ByteQuadsCanonicalizer
      * Default value is 2, for buckets of 4 slots; grows bigger with
      * bigger table sizes.
      */
-    private int _tertiaryShift;
+    protected int _tertiaryShift;
 
     /**
      * Total number of Strings in the symbol table; only used for child tables.
      */
-    private int _count;
+    protected int _count;
 
     /**
      * Array that contains <code>String</code> instances matching
      * entries in {@link #_hashArea}.
      * Contains nulls for unused entries. Note that this size is twice
      * that of {@link #_hashArea}
      */
-    private String[] _names;
+    protected String[] _names;
 
     /*
     /**********************************************************
@@ -176,7 +176,7 @@ public final class ByteQuadsCanonicalizer
      * for more spilled over entries (if any).
      * Spill over area is within fixed-size portion of {@link #_hashArea}.
      */
-    private int _spilloverEnd;
+    protected int _spilloverEnd;
 
     /**
      * Offset within {@link #_hashArea} that follows main slots and contains
@@ -186,7 +186,7 @@ public final class ByteQuadsCanonicalizer
      * Note that long name area follows immediately after the fixed-size
      * main hash area ({@link #_hashArea}).
      */
-    private int _longNameOffset;
+    protected int _longNameOffset;
 
     /*
     /**********************************************************
@@ -207,7 +207,7 @@ public final class ByteQuadsCanonicalizer
      * and when adding new collision list queues (i.e. creating a new
      * collision list head entry)
      */
-    private boolean _hashShared;
+    protected boolean _hashShared;
 
     /*
     /**********************************************************

src/main/java/com/fasterxml/jackson/core/sym/CharsToNameCanonicalizer.java

@@ -101,15 +101,15 @@ public final class CharsToNameCanonicalizer
      * defined, and child instance is released (call to <code>release</code>),
      * parent's shared tables may be updated from the child instance.
      */
-    final private CharsToNameCanonicalizer _parent;
+    final protected CharsToNameCanonicalizer _parent;
 
     /**
      * Member that is only used by the root table instance: root
      * passes immutable state info child instances, and children
      * may return new state if they add entries to the table.
      * Child tables do NOT use the reference.
      */
-    final private AtomicReference<TableInfo> _tableInfo;
+    final protected AtomicReference<TableInfo> _tableInfo;
 
     /**
      * Seed value we use as the base to make hash codes non-static between
@@ -120,17 +120,17 @@ public final class CharsToNameCanonicalizer
      * 
      * @since 2.1
      */
-    final private int _seed;
+    final protected int _seed;
 
-    final private int _flags;
+    final protected int _flags;
 
     /**
      * Whether any canonicalization should be attempted (whether using
      * intern or not.
      *<p>
      * NOTE: non-final since we may need to disable this with overflow.
      */
-    private boolean _canonicalize;
+    protected boolean _canonicalize;
 
     /*
     /**********************************************************
@@ -142,7 +142,7 @@ public final class CharsToNameCanonicalizer
      * Primary matching symbols; it's expected most match occur from
      * here.
      */
-    private String[] _symbols;
+    protected String[] _symbols;
 
     /**
      * Overflow buckets; if primary doesn't match, lookup is done
@@ -151,27 +151,27 @@ public final class CharsToNameCanonicalizer
      * Note: Number of buckets is half of number of symbol entries, on
      * assumption there's less need for buckets.
      */
-    private Bucket[] _buckets;
+    protected Bucket[] _buckets;
 
     /**
      * Current size (number of entries); needed to know if and when
      * rehash.
      */
-    private int _size;
+    protected int _size;
 
     /**
      * Limit that indicates maximum size this instance can hold before
      * it needs to be expanded and rehashed. Calculated using fill
      * factor passed in to constructor.
      */
-    private int _sizeThreshold;
+    protected int _sizeThreshold;
 
     /**
      * Mask used to get index from hash values; equal to
      * <code>_buckets.length - 1</code>, when _buckets.length is
      * a power of two.
      */
-    private int _indexMask;
+    protected int _indexMask;
 
     /**
      * We need to keep track of the longest collision list; this is needed
@@ -180,7 +180,7 @@ public final class CharsToNameCanonicalizer
      * 
      * @since 2.1
      */
-    private int _longestCollisionList;
+    protected int _longestCollisionList;
 
     /*
     /**********************************************************
@@ -199,7 +199,7 @@ public final class CharsToNameCanonicalizer
      * and when adding new collision list queues (i.e. creating a new
      * collision list head entry)
      */
-    private boolean _hashShared;
+    protected boolean _hashShared;
 
     /*
     /**********************************************************
@@ -215,7 +215,7 @@ public final class CharsToNameCanonicalizer
      * 
      * @since 2.4
      */
-    private BitSet _overflows;
+    protected BitSet _overflows;
 
     /*
     /**********************************************************

src/test/java/com/fasterxml/jackson/core/filter/GeneratorFiltering609Test.java

@@ -3,16 +3,14 @@
 import java.io.*;
 
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.filter.FilteringGeneratorDelegate;
-import com.fasterxml.jackson.core.filter.TokenFilter;
 import com.fasterxml.jackson.core.util.JsonGeneratorDelegate;
 
 // for [core#609]
 public class GeneratorFiltering609Test
     extends com.fasterxml.jackson.core.BaseTest
 {
     static class NullExcludingTokenFilter extends TokenFilter {
-        private static final NullExcludingTokenFilter INSTANCE =
+        static final NullExcludingTokenFilter INSTANCE =
                 new NullExcludingTokenFilter();
 
         @Override
@@ -27,7 +25,7 @@ static class StringTruncatingGeneratorDelegate
     {
         private final int maxStringLength;
 
-        private StringTruncatingGeneratorDelegate(
+        StringTruncatingGeneratorDelegate(
                 JsonGenerator jsonGenerator,
                 int maxStringLength) {
             super(jsonGenerator);

src/test/java/com/fasterxml/jackson/core/json/JsonFactoryTest.java

@@ -10,7 +10,7 @@
 public class JsonFactoryTest
     extends com.fasterxml.jackson.core.BaseTest
 {
-    private static class BogusCodec extends ObjectCodec {
+    static class BogusCodec extends ObjectCodec {
         @Override
         public Version version() { return null; }