Rebase on upstream master, resolve errorprone. Shade left Google classes properly. Use diamond as Java 7 is minimal now.

Author: soberich

src/main/java/com/github/fge/jackson/JacksonUtils.java

@@ -99,7 +99,7 @@ public static Map<String, JsonNode> asMap(final JsonNode node)
             return Collections.emptyMap();
 
         final Iterator<Map.Entry<String, JsonNode>> iterator = node.fields();
-        final Map<String, JsonNode> ret = new HashMap<String, JsonNode>();
+        final Map<String, JsonNode> ret = new HashMap<>();
 
         Map.Entry<String, JsonNode> entry;
 
@@ -108,7 +108,7 @@ public static Map<String, JsonNode> asMap(final JsonNode node)
             ret.put(entry.getKey(), entry.getValue());
         }
 
-        return ret;
+        return Collections.unmodifiableMap(ret);
     }
 
     /**

src/main/java/com/github/fge/jackson/JsonNumEquals.java

@@ -20,7 +20,7 @@
 package com.github.fge.jackson;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.base.Equivalence;
+import com.github.fge.jackson.com.google.common.base.Equivalence;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -183,7 +183,7 @@ private boolean objectEquals(final JsonNode a, final JsonNode b)
         /*
          * Grab the key set from the first node
          */
-        final Set<String> keys = new HashSet<String>();
+        final Set<String> keys = new HashSet<>();
         Iterator<String> iterator1 = a.fieldNames();
         while (iterator1.hasNext()) {
             final String next = iterator1.next();
@@ -198,7 +198,7 @@ private boolean objectEquals(final JsonNode a, final JsonNode b)
          * Grab the key set from the second node, and see if both sets are the
          * same. If not, objects are not equal, no need to check for children.
          */
-        final Set<String> set = new HashSet<String>();
+        final Set<String> set = new HashSet<>();
         Iterator<String> iterator2 = b.fieldNames();
         while (iterator2.hasNext()) {
             final String next = iterator2.next();

src/main/java/com/github/fge/jackson/NodeType.java

@@ -86,7 +86,7 @@ public enum NodeType
      * #getNodeType(JsonNode)})
      */
     private static final Map<JsonToken, NodeType> TOKEN_MAP
-        = new EnumMap<JsonToken, NodeType>(JsonToken.class);
+        = new EnumMap<>(JsonToken.class);
 
     static {
         TOKEN_MAP.put(JsonToken.START_ARRAY, ARRAY);
@@ -99,7 +99,7 @@ public enum NodeType
         TOKEN_MAP.put(JsonToken.VALUE_STRING, STRING);
 
         final Map<String, NodeType> builder
-            = new HashMap<String, NodeType>();
+            = new HashMap<>();
 
         for (final NodeType type: NodeType.values())
             builder.put(type.name, type);

src/main/java/com/google/common/base/Equivalence.java renamed to src/main/java/com/github/fge/jackson/com/google/common/base/Equivalence.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.common.base;
+package com.github.fge.jackson.com.google.common.base;
 
 import javax.annotation.Nullable;
 import java.io.Serializable;
@@ -124,7 +124,7 @@ public final int hash(@Nullable T t) {
      * instance.
      */
     public final <F> Equivalence<F> onResultOf(Function<F, ? extends T> function) {
-        return new FunctionalEquivalence<F, T>(function, this);
+        return new FunctionalEquivalence<>(function, this);
     }
 
     /**
@@ -224,15 +224,15 @@ private Wrapper(Equivalence<? super T> equivalence, @Nullable T reference) {
     public final <S extends T> Equivalence<Iterable<S>> pairwise() {
         // Ideally, the returned equivalence would support Iterable<? extends T>. However,
         // the need for this is so rare that it's not worth making callers deal with the ugly wildcard.
-        return new PairwiseEquivalence<S>(this);
+        return new PairwiseEquivalence<>(this);
     }
 
     /**
      * Returns a predicate that evaluates to true if and only if the input is
      * equivalent to {@code target} according to this equivalence relation.
      */
     public final Predicate<T> equivalentTo(@Nullable T target) {
-        return new EquivalentToPredicate<T>(this, target);
+        return new EquivalentToPredicate<>(this, target);
     }
 
     private static final class EquivalentToPredicate<T> implements Predicate<T>, Serializable {
@@ -258,8 +258,8 @@ private static final class EquivalentToPredicate<T> implements Predicate<T>, Ser
             }
             if (obj instanceof EquivalentToPredicate) {
                 EquivalentToPredicate<?> that = (EquivalentToPredicate<?>) obj;
-                return equivalence.equals(that.equivalence)
-                        && target == that.target || (target != null && target.equals(that.target));
+                return (equivalence.equals(that.equivalence)
+                        && (target == that.target)) || ((target != null) && target.equals(that.target));
             }
             return false;
         }
@@ -330,4 +330,4 @@ private Object readResolve() {
         }
         private static final long serialVersionUID = 1;
     }
-}
+}

src/main/java/com/google/common/base/Function.java renamed to src/main/java/com/github/fge/jackson/com/google/common/base/Function.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.common.base;
+package com.github.fge.jackson.com.google.common.base;
 
 import javax.annotation.Nullable;
 
@@ -61,4 +61,4 @@ public interface Function<F, T> {
      */
     @Override
     boolean equals(@Nullable Object object);
-}
+}

src/main/java/com/google/common/base/FunctionalEquivalence.java renamed to src/main/java/com/github/fge/jackson/com/google/common/base/FunctionalEquivalence.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.common.base;
+package com.github.fge.jackson.com.google.common.base;
 
 import javax.annotation.Nullable;
 import java.io.Serializable;

src/main/java/com/google/common/base/PairwiseEquivalence.java renamed to src/main/java/com/github/fge/jackson/com/google/common/base/PairwiseEquivalence.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.common.base;
+package com.github.fge.jackson.com.google.common.base;
 
 import javax.annotation.Nullable;
 import java.io.Serializable;

src/main/java/com/google/common/base/Predicate.java renamed to src/main/java/com/github/fge/jackson/com/google/common/base/Predicate.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.common.base;
+package com.github.fge.jackson.com.google.common.base;
 
 import javax.annotation.Nullable;
 

src/main/java/com/github/fge/jackson/jsonpointer/JsonPointer.java

@@ -72,7 +72,7 @@ public static JsonPointer empty()
      */
     public static JsonPointer of(final Object first, final Object... other)
     {
-        final List<ReferenceToken> tokens = new ArrayList<ReferenceToken>();
+        final List<ReferenceToken> tokens = new ArrayList<>();
 
         tokens.add(ReferenceToken.fromRaw(first.toString()));
 
@@ -120,7 +120,7 @@ public JsonPointer append(final String raw)
         final ReferenceToken refToken = ReferenceToken.fromRaw(raw);
         final JsonNodeResolver resolver = new JsonNodeResolver(refToken);
         final List<TokenResolver<JsonNode>> list
-            = new ArrayList<TokenResolver<JsonNode>>();
+            = new ArrayList<>();
         for (final TokenResolver<JsonNode> tokenResolver : tokenResolvers) {
             if (tokenResolver != null) {
                 list.add(tokenResolver);
@@ -154,7 +154,7 @@ public JsonPointer append(final JsonPointer other)
     {
         BUNDLE.checkNotNull(other, "nullInput");
         final List<TokenResolver<JsonNode>> list
-            = new ArrayList<TokenResolver<JsonNode>>();
+            = new ArrayList<>();
         for (final TokenResolver<JsonNode> tokenResolver : tokenResolvers) {
             if (tokenResolver != null) {
                 list.add(tokenResolver);
@@ -191,7 +191,7 @@ public JsonPointer parent()
     private static List<TokenResolver<JsonNode>> fromTokens(
         final List<ReferenceToken> tokens)
     {
-        final List<TokenResolver<JsonNode>> list = new ArrayList<TokenResolver<JsonNode>>();
+        final List<TokenResolver<JsonNode>> list = new ArrayList<>();
         for (final ReferenceToken token: tokens)
             list.add(new JsonNodeResolver(token));
         return list;

src/main/java/com/github/fge/jackson/jsonpointer/TreePointer.java

@@ -92,7 +92,7 @@ protected TreePointer(final T missing,
         final List<TokenResolver<T>> tokenResolvers)
     {
         this.missing = missing;
-        this.tokenResolvers = Collections.unmodifiableList(new ArrayList<TokenResolver<T>>(tokenResolvers));
+        this.tokenResolvers = Collections.unmodifiableList(new ArrayList<>(tokenResolvers));
     }
 
     /**
@@ -206,7 +206,7 @@ protected static List<ReferenceToken> tokensFromInput(final String input)
         throws JsonPointerException
     {
         String s = BUNDLE.checkNotNull(input, "nullInput");
-        final List<ReferenceToken> ret = new ArrayList<ReferenceToken>();
+        final List<ReferenceToken> ret = new ArrayList<>();
         String cooked;
         int index;
         char c;

src/test/java/com/github/fge/jackson/JsonNodeReaderTest.java

@@ -33,6 +33,7 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -70,7 +71,7 @@ public void readerIsClosedOnRead()
     @DataProvider
     public Iterator<Object[]> getMalformedData()
     {
-        final List<Object[]> list = new ArrayList<Object[]>();
+        final List<Object[]> list = new ArrayList<>();
 
         list.add(new Object[] { "", "read.noContent"});
         list.add(new Object[] { "[]{}", "read.trailingData"});
@@ -104,11 +105,7 @@ private static Supplier<InputStream> provideInputStream(final String input)
             @Override
             public InputStream get()
             {
-                try {
-                    return new ByteArrayInputStream(input.getBytes("UTF-8"));
-                } catch (UnsupportedEncodingException e) {
-                    throw new RuntimeException("Unhandled exception", e);
-                }
+                return new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8));
             }
         };
     }

src/test/java/com/github/fge/jackson/JsonNumEqualsTest.java

@@ -49,7 +49,7 @@ public void initData()
     @DataProvider
     public Iterator<Object[]> getInputs()
     {
-        final List<Object[]> list = new ArrayList<Object[]>();
+        final List<Object[]> list = new ArrayList<>();
 
         JsonNode reference;
 

src/test/java/com/github/fge/jackson/SampleNodeProvider.java

@@ -35,7 +35,7 @@ private SampleNodeProvider()
     }
 
     static {
-        SAMPLE_DATA = new EnumMap<NodeType, JsonNode>(NodeType.class);
+        SAMPLE_DATA = new EnumMap<>(NodeType.class);
 
         SAMPLE_DATA.put(NodeType.ARRAY, FACTORY.arrayNode());
         SAMPLE_DATA.put(NodeType.BOOLEAN, FACTORY.booleanNode(true));
@@ -52,10 +52,10 @@ private SampleNodeProvider()
     // differ...
     public static Iterator<Object[]> getSamples(final EnumSet<NodeType> types)
     {
-        final Map<NodeType, JsonNode> map = new EnumMap<NodeType, JsonNode>(SAMPLE_DATA);
+        final Map<NodeType, JsonNode> map = new EnumMap<>(SAMPLE_DATA);
         map.keySet().retainAll(types);
 
-        final List<Object[]> samples = new ArrayList<Object[]>();
+        final List<Object[]> samples = new ArrayList<>();
         for (final JsonNode input : map.values()) {
             samples.add(new Object[] { input });
         }

src/test/java/com/github/fge/jackson/jsonpointer/JsonNodeResolverTest.java

@@ -104,7 +104,7 @@ public void resolvingArrayIndicesWorks()
     @DataProvider
     public Iterator<Object[]> invalidIndices()
     {
-        final List<Object[]> list = new ArrayList<Object[]>();
+        final List<Object[]> list = new ArrayList<>();
 
         list.add(new Object[] { "-1" });
         list.add(new Object[] { "232398087298731987987232" });

src/test/java/com/github/fge/jackson/jsonpointer/JsonPointerTest.java

@@ -66,7 +66,7 @@ public void cannotAppendNullPointer()
     @DataProvider
     public Iterator<Object[]> rawPointers()
     {
-        final List<Object[]> list = new ArrayList<Object[]>();
+        final List<Object[]> list = new ArrayList<>();
         final JsonNode testNode = testData.get("pointers");
         final Map<String, JsonNode> map = JacksonUtils.asMap(testNode);
 
@@ -89,7 +89,7 @@ public void rawPointerResolvingWorks(final String input,
     @DataProvider
     public Iterator<Object[]> uriPointers()
     {
-        final List<Object[]> list = new ArrayList<Object[]>();
+        final List<Object[]> list = new ArrayList<>();
         final JsonNode testNode = testData.get("uris");
         final Map<String, JsonNode> map = JacksonUtils.asMap(testNode);
 
@@ -181,7 +181,7 @@ public void staticConstructionFromTokensWorks()
     @DataProvider
     public Iterator<Object[]> parentTestData()
     {
-        final List<Object[]> list = new ArrayList<Object[]>();
+        final List<Object[]> list = new ArrayList<>();
 
         // Empty
         list.add(new Object[] { JsonPointer.empty(), JsonPointer.empty() });

src/test/java/com/github/fge/jackson/jsonpointer/TreePointerTest.java

@@ -154,7 +154,7 @@ public void gettingPathOfMissingNodeReturnsMissingNode()
     @Test
     public void treePointerCanTellWhetherItIsEmpty()
     {
-        final List<TokenResolver<TreeNode>> list = new ArrayList<TokenResolver<TreeNode>>();
+        final List<TokenResolver<TreeNode>> list = new ArrayList<>();
 
         assertTrue(new DummyPointer(null, list).isEmpty());
 
@@ -168,7 +168,7 @@ public void treePointerCanTellWhetherItIsEmpty()
     @Test
     public void treeIsUnalteredWhenOriginalListIsAltered()
     {
-        final List<TokenResolver<TreeNode>> list = new ArrayList<TokenResolver<TreeNode>>();
+        final List<TokenResolver<TreeNode>> list = new ArrayList<>();
         final DummyPointer dummy = new DummyPointer(null, list);
 
         @SuppressWarnings("unchecked")