From 8af08de19eb6642a6ac27760d91fa5ffdbcc61ed Mon Sep 17 00:00:00 2001 From: Jake Wharton Date: Fri, 27 Mar 2015 00:37:01 -0400 Subject: [PATCH] Clean up warnings for Java 7 language level. --- .../com/squareup/moshi/LinkedHashTreeMap.java | 14 ++++---- .../com/squareup/moshi/MapJsonAdapter.java | 2 +- .../squareup/moshi/LinkedHashTreeMapTest.java | 34 +++++++++---------- .../java/com/squareup/moshi/MoshiTest.java | 4 +-- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/moshi/src/main/java/com/squareup/moshi/LinkedHashTreeMap.java b/moshi/src/main/java/com/squareup/moshi/LinkedHashTreeMap.java index 8d33022..ca91526 100644 --- a/moshi/src/main/java/com/squareup/moshi/LinkedHashTreeMap.java +++ b/moshi/src/main/java/com/squareup/moshi/LinkedHashTreeMap.java @@ -72,7 +72,7 @@ final class LinkedHashTreeMap extends AbstractMap implements Seriali this.comparator = comparator != null ? comparator : (Comparator) NATURAL_ORDER; - this.header = new Node(); + this.header = new Node<>(); this.table = new Node[16]; // TODO: sizing/resizing policies this.threshold = (table.length / 2) + (table.length / 4); // 3/4 capacity } @@ -175,10 +175,10 @@ final class LinkedHashTreeMap extends AbstractMap implements Seriali if (comparator == NATURAL_ORDER && !(key instanceof Comparable)) { throw new ClassCastException(key.getClass().getName() + " is not Comparable"); } - created = new Node(nearest, key, hash, header, header.prev); + created = new Node<>(nearest, key, hash, header, header.prev); table[index] = created; } else { - created = new Node(nearest, key, hash, header, header.prev); + created = new Node<>(nearest, key, hash, header, header.prev); if (comparison < 0) { // nearest.key is higher nearest.left = created; } else { // comparison > 0, nearest.key is lower @@ -567,9 +567,9 @@ final class LinkedHashTreeMap extends AbstractMap implements Seriali int oldCapacity = oldTable.length; @SuppressWarnings("unchecked") // Arrays and generics don't get along. Node[] newTable = new Node[oldCapacity * 2]; - AvlIterator iterator = new AvlIterator(); - AvlBuilder leftBuilder = new AvlBuilder(); - AvlBuilder rightBuilder = new AvlBuilder(); + AvlIterator iterator = new AvlIterator<>(); + AvlBuilder leftBuilder = new AvlBuilder<>(); + AvlBuilder rightBuilder = new AvlBuilder<>(); // Split each tree into two trees. for (int i = 0; i < oldCapacity; i++) { @@ -855,6 +855,6 @@ final class LinkedHashTreeMap extends AbstractMap implements Seriali * shouldn't use it. */ private Object writeReplace() throws ObjectStreamException { - return new LinkedHashMap(this); + return new LinkedHashMap<>(this); } } diff --git a/moshi/src/main/java/com/squareup/moshi/MapJsonAdapter.java b/moshi/src/main/java/com/squareup/moshi/MapJsonAdapter.java index e497236..ad14cbd 100644 --- a/moshi/src/main/java/com/squareup/moshi/MapJsonAdapter.java +++ b/moshi/src/main/java/com/squareup/moshi/MapJsonAdapter.java @@ -33,7 +33,7 @@ final class MapJsonAdapter extends JsonAdapter> { Type[] keyAndValue = Types.mapKeyAndValueTypes(type, rawType); if (keyAndValue[0] != String.class) return null; return new MapJsonAdapter<>(moshi, keyAndValue[1]).nullSafe(); - }; + } }; private final JsonAdapter valueAdapter; diff --git a/moshi/src/test/java/com/squareup/moshi/LinkedHashTreeMapTest.java b/moshi/src/test/java/com/squareup/moshi/LinkedHashTreeMapTest.java index cee5738..5785841 100644 --- a/moshi/src/test/java/com/squareup/moshi/LinkedHashTreeMapTest.java +++ b/moshi/src/test/java/com/squareup/moshi/LinkedHashTreeMapTest.java @@ -34,7 +34,7 @@ import static org.junit.Assert.fail; public final class LinkedHashTreeMapTest { @Test public void iterationOrder() { - LinkedHashTreeMap map = new LinkedHashTreeMap(); + LinkedHashTreeMap map = new LinkedHashTreeMap<>(); map.put("a", "android"); map.put("c", "cola"); map.put("b", "bbq"); @@ -43,7 +43,7 @@ public final class LinkedHashTreeMapTest { } @Test public void removeRootDoesNotDoubleUnlink() { - LinkedHashTreeMap map = new LinkedHashTreeMap(); + LinkedHashTreeMap map = new LinkedHashTreeMap<>(); map.put("a", "android"); map.put("c", "cola"); map.put("b", "bbq"); @@ -56,7 +56,7 @@ public final class LinkedHashTreeMapTest { } @Test public void putNullKeyFails() { - LinkedHashTreeMap map = new LinkedHashTreeMap(); + LinkedHashTreeMap map = new LinkedHashTreeMap<>(); try { map.put(null, "android"); fail(); @@ -65,7 +65,7 @@ public final class LinkedHashTreeMapTest { } @Test public void putNonComparableKeyFails() { - LinkedHashTreeMap map = new LinkedHashTreeMap(); + LinkedHashTreeMap map = new LinkedHashTreeMap<>(); try { map.put(new Object(), "android"); fail(); @@ -73,19 +73,19 @@ public final class LinkedHashTreeMapTest { } @Test public void ContainsNonComparableKeyReturnsFalse() { - LinkedHashTreeMap map = new LinkedHashTreeMap(); + LinkedHashTreeMap map = new LinkedHashTreeMap<>(); map.put("a", "android"); assertFalse(map.containsKey(new Object())); } @Test public void containsNullKeyIsAlwaysFalse() { - LinkedHashTreeMap map = new LinkedHashTreeMap(); + LinkedHashTreeMap map = new LinkedHashTreeMap<>(); map.put("a", "android"); assertFalse(map.containsKey(null)); } @Test public void putOverrides() throws Exception { - LinkedHashTreeMap map = new LinkedHashTreeMap(); + LinkedHashTreeMap map = new LinkedHashTreeMap<>(); assertNull(map.put("d", "donut")); assertNull(map.put("e", "eclair")); assertNull(map.put("f", "froyo")); @@ -97,7 +97,7 @@ public final class LinkedHashTreeMapTest { } @Test public void emptyStringValues() { - LinkedHashTreeMap map = new LinkedHashTreeMap(); + LinkedHashTreeMap map = new LinkedHashTreeMap<>(); map.put("a", ""); assertTrue(map.containsKey("a")); assertEquals("", map.get("a")); @@ -108,7 +108,7 @@ public final class LinkedHashTreeMapTest { // size remains at 3/4) @Test public void forceDoublingAndRehash() throws Exception { Random random = new Random(1367593214724L); - LinkedHashTreeMap map = new LinkedHashTreeMap(); + LinkedHashTreeMap map = new LinkedHashTreeMap<>(); String[] keys = new String[1000]; for (int i = 0; i < keys.length; i++) { keys[i] = Integer.toString(Math.abs(random.nextInt()), 36) + "-" + i; @@ -123,7 +123,7 @@ public final class LinkedHashTreeMapTest { } @Test public void clear() { - LinkedHashTreeMap map = new LinkedHashTreeMap(); + LinkedHashTreeMap map = new LinkedHashTreeMap<>(); map.put("a", "android"); map.put("c", "cola"); map.put("b", "bbq"); @@ -133,13 +133,13 @@ public final class LinkedHashTreeMapTest { } @Test public void equalsAndHashCode() throws Exception { - LinkedHashTreeMap map1 = new LinkedHashTreeMap(); + LinkedHashTreeMap map1 = new LinkedHashTreeMap<>(); map1.put("A", 1); map1.put("B", 2); map1.put("C", 3); map1.put("D", 4); - LinkedHashTreeMap map2 = new LinkedHashTreeMap(); + LinkedHashTreeMap map2 = new LinkedHashTreeMap<>(); map2.put("C", 3); map2.put("B", 2); map2.put("D", 4); @@ -163,7 +163,7 @@ public final class LinkedHashTreeMapTest { } private void assertAvlWalker(Node root, String... values) { - AvlIterator iterator = new AvlIterator(); + AvlIterator iterator = new AvlIterator<>(); iterator.reset(root); for (String value : values) { assertEquals(value, iterator.next().getKey()); @@ -196,7 +196,7 @@ public final class LinkedHashTreeMapTest { private void assertAvlBuilder(int size, String expected) { char[] values = "abcdefghijklmnopqrstuvwxyzABCDE".toCharArray(); - AvlBuilder avlBuilder = new AvlBuilder(); + AvlBuilder avlBuilder = new AvlBuilder<>(); avlBuilder.reset(size); for (int i = 0; i < size; i++) { avlBuilder.add(node(Character.toString(values[i]))); @@ -230,10 +230,10 @@ public final class LinkedHashTreeMapTest { } } - private static final Node head = new Node(); + private static final Node head = new Node<>(); private Node node(String value) { - return new Node(null, value, value.hashCode(), head, head); + return new Node<>(null, value, value.hashCode(), head, head); } private Node node(Node left, String value, @@ -287,7 +287,7 @@ public final class LinkedHashTreeMapTest { } private void assertIterationOrder(Iterable actual, T... expected) { - ArrayList actualList = new ArrayList(); + ArrayList actualList = new ArrayList<>(); for (T t : actual) { actualList.add(t); } diff --git a/moshi/src/test/java/com/squareup/moshi/MoshiTest.java b/moshi/src/test/java/com/squareup/moshi/MoshiTest.java index eed1661..392111b 100644 --- a/moshi/src/test/java/com/squareup/moshi/MoshiTest.java +++ b/moshi/src/test/java/com/squareup/moshi/MoshiTest.java @@ -605,7 +605,7 @@ public final class MoshiTest { } @Test public void setJsonAdapter() throws Exception { - Set set = new LinkedHashSet(); + Set set = new LinkedHashSet<>(); set.add("a"); set.add("b"); @@ -617,7 +617,7 @@ public final class MoshiTest { } @Test public void collectionJsonAdapter() throws Exception { - Collection collection = new ArrayDeque(); + Collection collection = new ArrayDeque<>(); collection.add("a"); collection.add("b");