Skip to content

Commit bbdd5a7

Browse files
committed
Fix compilability with javac7, which is stricter with generics and accessing private fields from subclasses or nested classes.
1 parent 70474bc commit bbdd5a7

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

google-http-client-test/src/main/java/com/google/api/client/testing/json/AbstractJsonFactoryTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -616,15 +616,15 @@ public void testParser_wildCardType() throws Exception {
616616
// serialize
617617
assertEquals(WILDCARD_TYPE, factory.toString(result));
618618
// check parsed result
619-
Collection<BigDecimal>[] simple = (Collection<BigDecimal>[]) result.simple;
619+
Collection<?>[] simple = result.simple;
620620
ArrayList<BigDecimal> wildcard = (ArrayList<BigDecimal>) simple[0];
621621
BigDecimal wildcardFirstValue = wildcard.get(0);
622622
assertEquals(1, wildcardFirstValue.intValue());
623-
Collection<Integer>[] upper = (Collection<Integer>[]) result.upper;
623+
Collection<? extends Integer>[] upper = result.upper;
624624
ArrayList<Integer> wildcardUpper = (ArrayList<Integer>) upper[0];
625625
Integer wildcardFirstValueUpper = wildcardUpper.get(0);
626626
assertEquals(1, wildcardFirstValueUpper.intValue());
627-
Collection<Integer>[] lower = (Collection<Integer>[]) result.lower;
627+
Collection<? super Integer>[] lower = result.lower;
628628
ArrayList<Integer> wildcardLower = (ArrayList<Integer>) lower[0];
629629
Integer wildcardFirstValueLower = wildcardLower.get(0);
630630
assertEquals(1, wildcardFirstValueLower.intValue());
@@ -634,9 +634,9 @@ public void testParser_wildCardType() throws Exception {
634634
Map<String, Integer> mapUpper = (Map<String, Integer>) result.mapUpper;
635635
Integer mapUpperValue = mapUpper.get("v");
636636
assertEquals(1, mapUpperValue.intValue());
637-
ArrayList<TreeMap<String, ? extends Integer>> mapInWild =
638-
(ArrayList<TreeMap<String, ? extends Integer>>) result.mapInWild;
639-
TreeMap<String, Integer> mapInWildFirst = (TreeMap<String, Integer>) mapInWild.get(0);
637+
Collection<? super TreeMap<String, ? extends Integer>> mapInWild = result.mapInWild;
638+
TreeMap<String, ? extends Integer> mapInWildFirst =
639+
(TreeMap<String, ? extends Integer>) mapInWild.toArray()[0];
640640
Integer mapInWildFirstValue = mapInWildFirst.get("v");
641641
assertEquals(1, mapInWildFirstValue.intValue());
642642
}

0 commit comments

Comments
 (0)