fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-10-20 00:19:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up warnings for Java 7 language level.

Browse Source
This commit is contained in:
Jake Wharton
2015-03-27 00:37:01 -04:00
parent 1e741c0f71
commit 8af08de19e
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
moshi/src/main/java/com/squareup/moshi/LinkedHashTreeMap.java
View File

@@ -72,7 +72,7 @@ final class LinkedHashTreeMap<K, V> extends AbstractMap<K, V> implements Seriali
this.comparator = comparator != null this.comparator = comparator != null
? comparator ? comparator
: (Comparator) NATURAL_ORDER; : (Comparator) NATURAL_ORDER;
this.header = new Node<K, V>(); this.header = new Node<>();
this.table = new Node[16]; // TODO: sizing/resizing policies this.table = new Node[16]; // TODO: sizing/resizing policies
this.threshold = (table.length / 2) + (table.length / 4); // 3/4 capacity this.threshold = (table.length / 2) + (table.length / 4); // 3/4 capacity
} }
@@ -175,10 +175,10 @@ final class LinkedHashTreeMap<K, V> extends AbstractMap<K, V> implements Seriali
if (comparator == NATURAL_ORDER && !(key instanceof Comparable)) { if (comparator == NATURAL_ORDER && !(key instanceof Comparable)) {
throw new ClassCastException(key.getClass().getName() + " is not Comparable"); throw new ClassCastException(key.getClass().getName() + " is not Comparable");
} }
created = new Node<K, V>(nearest, key, hash, header, header.prev); created = new Node<>(nearest, key, hash, header, header.prev);
table[index] = created; table[index] = created;
} else { } else {
created = new Node<K, V>(nearest, key, hash, header, header.prev); created = new Node<>(nearest, key, hash, header, header.prev);
if (comparison < 0) { // nearest.key is higher if (comparison < 0) { // nearest.key is higher
nearest.left = created; nearest.left = created;
} else { // comparison > 0, nearest.key is lower } else { // comparison > 0, nearest.key is lower
@@ -567,9 +567,9 @@ final class LinkedHashTreeMap<K, V> extends AbstractMap<K, V> implements Seriali
int oldCapacity = oldTable.length; int oldCapacity = oldTable.length;
@SuppressWarnings("unchecked") // Arrays and generics don't get along. @SuppressWarnings("unchecked") // Arrays and generics don't get along.
Node<K, V>[] newTable = new Node[oldCapacity * 2]; Node<K, V>[] newTable = new Node[oldCapacity * 2];
AvlIterator<K, V> iterator = new AvlIterator<K, V>(); AvlIterator<K, V> iterator = new AvlIterator<>();
AvlBuilder<K, V> leftBuilder = new AvlBuilder<K, V>(); AvlBuilder<K, V> leftBuilder = new AvlBuilder<>();
AvlBuilder<K, V> rightBuilder = new AvlBuilder<K, V>(); AvlBuilder<K, V> rightBuilder = new AvlBuilder<>();
// Split each tree into two trees. // Split each tree into two trees.
for (int i = 0; i < oldCapacity; i++) { for (int i = 0; i < oldCapacity; i++) {
@@ -855,6 +855,6 @@ final class LinkedHashTreeMap<K, V> extends AbstractMap<K, V> implements Seriali
* shouldn't use it. * shouldn't use it.
*/ */
private Object writeReplace() throws ObjectStreamException { private Object writeReplace() throws ObjectStreamException {
return new LinkedHashMap<K, V>(this); return new LinkedHashMap<>(this);
} }
} }

2
moshi/src/main/java/com/squareup/moshi/MapJsonAdapter.java
View File

@@ -33,7 +33,7 @@ final class MapJsonAdapter<K, V> extends JsonAdapter<Map<K, V>> {
Type[] keyAndValue = Types.mapKeyAndValueTypes(type, rawType); Type[] keyAndValue = Types.mapKeyAndValueTypes(type, rawType);
if (keyAndValue[0] != String.class) return null; if (keyAndValue[0] != String.class) return null;
return new MapJsonAdapter<>(moshi, keyAndValue[1]).nullSafe(); return new MapJsonAdapter<>(moshi, keyAndValue[1]).nullSafe();
}; }
}; };
private final JsonAdapter<V> valueAdapter; private final JsonAdapter<V> valueAdapter;

34
moshi/src/test/java/com/squareup/moshi/LinkedHashTreeMapTest.java
View File

@@ -34,7 +34,7 @@ import static org.junit.Assert.fail;
public final class LinkedHashTreeMapTest { public final class LinkedHashTreeMapTest {
@Test public void iterationOrder() { @Test public void iterationOrder() {
LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<String, String>(); LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<>();
map.put("a", "android"); map.put("a", "android");
map.put("c", "cola"); map.put("c", "cola");
map.put("b", "bbq"); map.put("b", "bbq");
@@ -43,7 +43,7 @@ public final class LinkedHashTreeMapTest {
} }
@Test public void removeRootDoesNotDoubleUnlink() { @Test public void removeRootDoesNotDoubleUnlink() {
LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<String, String>(); LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<>();
map.put("a", "android"); map.put("a", "android");
map.put("c", "cola"); map.put("c", "cola");
map.put("b", "bbq"); map.put("b", "bbq");
@@ -56,7 +56,7 @@ public final class LinkedHashTreeMapTest {
} }
@Test public void putNullKeyFails() { @Test public void putNullKeyFails() {
LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<String, String>(); LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<>();
try { try {
map.put(null, "android"); map.put(null, "android");
fail(); fail();
@@ -65,7 +65,7 @@ public final class LinkedHashTreeMapTest {
} }
@Test public void putNonComparableKeyFails() { @Test public void putNonComparableKeyFails() {
LinkedHashTreeMap<Object, String> map = new LinkedHashTreeMap<Object, String>(); LinkedHashTreeMap<Object, String> map = new LinkedHashTreeMap<>();
try { try {
map.put(new Object(), "android"); map.put(new Object(), "android");
fail(); fail();
@@ -73,19 +73,19 @@ public final class LinkedHashTreeMapTest {
} }
@Test public void ContainsNonComparableKeyReturnsFalse() { @Test public void ContainsNonComparableKeyReturnsFalse() {
LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<String, String>(); LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<>();
map.put("a", "android"); map.put("a", "android");
assertFalse(map.containsKey(new Object())); assertFalse(map.containsKey(new Object()));
} }
@Test public void containsNullKeyIsAlwaysFalse() { @Test public void containsNullKeyIsAlwaysFalse() {
LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<String, String>(); LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<>();
map.put("a", "android"); map.put("a", "android");
assertFalse(map.containsKey(null)); assertFalse(map.containsKey(null));
} }
@Test public void putOverrides() throws Exception { @Test public void putOverrides() throws Exception {
LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<String, String>(); LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<>();
assertNull(map.put("d", "donut")); assertNull(map.put("d", "donut"));
assertNull(map.put("e", "eclair")); assertNull(map.put("e", "eclair"));
assertNull(map.put("f", "froyo")); assertNull(map.put("f", "froyo"));
@@ -97,7 +97,7 @@ public final class LinkedHashTreeMapTest {
} }
@Test public void emptyStringValues() { @Test public void emptyStringValues() {
LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<String, String>(); LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<>();
map.put("a", ""); map.put("a", "");
assertTrue(map.containsKey("a")); assertTrue(map.containsKey("a"));
assertEquals("", map.get("a")); assertEquals("", map.get("a"));
@@ -108,7 +108,7 @@ public final class LinkedHashTreeMapTest {
// size remains at 3/4) // size remains at 3/4)
@Test public void forceDoublingAndRehash() throws Exception { @Test public void forceDoublingAndRehash() throws Exception {
Random random = new Random(1367593214724L); Random random = new Random(1367593214724L);
LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<String, String>(); LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<>();
String[] keys = new String[1000]; String[] keys = new String[1000];
for (int i = 0; i < keys.length; i++) { for (int i = 0; i < keys.length; i++) {
keys[i] = Integer.toString(Math.abs(random.nextInt()), 36) + "-" + i; keys[i] = Integer.toString(Math.abs(random.nextInt()), 36) + "-" + i;
@@ -123,7 +123,7 @@ public final class LinkedHashTreeMapTest {
} }
@Test public void clear() { @Test public void clear() {
LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<String, String>(); LinkedHashTreeMap<String, String> map = new LinkedHashTreeMap<>();
map.put("a", "android"); map.put("a", "android");
map.put("c", "cola"); map.put("c", "cola");
map.put("b", "bbq"); map.put("b", "bbq");
@@ -133,13 +133,13 @@ public final class LinkedHashTreeMapTest {
} }
@Test public void equalsAndHashCode() throws Exception { @Test public void equalsAndHashCode() throws Exception {
LinkedHashTreeMap<String, Integer> map1 = new LinkedHashTreeMap<String, Integer>(); LinkedHashTreeMap<String, Integer> map1 = new LinkedHashTreeMap<>();
map1.put("A", 1); map1.put("A", 1);
map1.put("B", 2); map1.put("B", 2);
map1.put("C", 3); map1.put("C", 3);
map1.put("D", 4); map1.put("D", 4);
LinkedHashTreeMap<String, Integer> map2 = new LinkedHashTreeMap<String, Integer>(); LinkedHashTreeMap<String, Integer> map2 = new LinkedHashTreeMap<>();
map2.put("C", 3); map2.put("C", 3);
map2.put("B", 2); map2.put("B", 2);
map2.put("D", 4); map2.put("D", 4);
@@ -163,7 +163,7 @@ public final class LinkedHashTreeMapTest {
} }
private void assertAvlWalker(Node<String, String> root, String... values) { private void assertAvlWalker(Node<String, String> root, String... values) {
AvlIterator<String, String> iterator = new AvlIterator<String, String>(); AvlIterator<String, String> iterator = new AvlIterator<>();
iterator.reset(root); iterator.reset(root);
for (String value : values) { for (String value : values) {
assertEquals(value, iterator.next().getKey()); assertEquals(value, iterator.next().getKey());
@@ -196,7 +196,7 @@ public final class LinkedHashTreeMapTest {
private void assertAvlBuilder(int size, String expected) { private void assertAvlBuilder(int size, String expected) {
char[] values = "abcdefghijklmnopqrstuvwxyzABCDE".toCharArray(); char[] values = "abcdefghijklmnopqrstuvwxyzABCDE".toCharArray();
AvlBuilder<String, String> avlBuilder = new AvlBuilder<String, String>(); AvlBuilder<String, String> avlBuilder = new AvlBuilder<>();
avlBuilder.reset(size); avlBuilder.reset(size);
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
avlBuilder.add(node(Character.toString(values[i]))); avlBuilder.add(node(Character.toString(values[i])));
@@ -230,10 +230,10 @@ public final class LinkedHashTreeMapTest {
} }
} }
private static final Node<String, String> head = new Node<String, String>(); private static final Node<String, String> head = new Node<>();
private Node<String, String> node(String value) { private Node<String, String> node(String value) {
return new Node<String, String>(null, value, value.hashCode(), head, head); return new Node<>(null, value, value.hashCode(), head, head);
} }
private Node<String, String> node(Node<String, String> left, String value, private Node<String, String> node(Node<String, String> left, String value,
@@ -287,7 +287,7 @@ public final class LinkedHashTreeMapTest {
} }
private <T> void assertIterationOrder(Iterable<T> actual, T... expected) { private <T> void assertIterationOrder(Iterable<T> actual, T... expected) {
ArrayList<T> actualList = new ArrayList<T>(); ArrayList<T> actualList = new ArrayList<>();
for (T t : actual) { for (T t : actual) {
actualList.add(t); actualList.add(t);
} }

4
moshi/src/test/java/com/squareup/moshi/MoshiTest.java
View File

@@ -605,7 +605,7 @@ public final class MoshiTest {
} }
@Test public void setJsonAdapter() throws Exception { @Test public void setJsonAdapter() throws Exception {
Set<String> set = new LinkedHashSet<String>(); Set<String> set = new LinkedHashSet<>();
set.add("a"); set.add("a");
set.add("b"); set.add("b");
@@ -617,7 +617,7 @@ public final class MoshiTest {
} }
@Test public void collectionJsonAdapter() throws Exception { @Test public void collectionJsonAdapter() throws Exception {
Collection<String> collection = new ArrayDeque<String>(); Collection<String> collection = new ArrayDeque<>();
collection.add("a"); collection.add("a");
collection.add("b"); collection.add("b");