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

Fail earlier for some incorrect owner types. (#450)

Browse Source
This commit is contained in:
Eric Cochran
2018-02-24 01:46:42 -08:00
committed by Jesse Wilson
parent ed1ea5a755
commit 8e28dd4ad7
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
moshi/src/main/java/com/squareup/moshi/Types.java
View File

@@ -503,10 +503,17 @@ public final class Types {
ParameterizedTypeImpl(@Nullable Type ownerType, Type rawType, Type... typeArguments) { ParameterizedTypeImpl(@Nullable Type ownerType, Type rawType, Type... typeArguments) {
// Require an owner type if the raw type needs it. // Require an owner type if the raw type needs it.
if (rawType instanceof Class<?> if (rawType instanceof Class<?>) {
&& (ownerType == null) != (((Class<?>) rawType).getEnclosingClass() == null)) { Class<?> enclosingClass = ((Class<?>) rawType).getEnclosingClass();
throw new IllegalArgumentException( if (ownerType != null) {
"unexpected owner type for " + rawType + ": " + ownerType); if (enclosingClass == null || Types.getRawType(ownerType) != enclosingClass) {
throw new IllegalArgumentException(
"unexpected owner type for " + rawType + ": " + ownerType);
}
} else if (enclosingClass != null) {
throw new IllegalArgumentException(
"unexpected owner type for " + rawType + ": null");
}
} }
this.ownerType = ownerType == null ? null : canonicalize(ownerType); this.ownerType = ownerType == null ? null : canonicalize(ownerType);

12
moshi/src/test/java/com/squareup/moshi/TypesTest.java
View File

@@ -100,6 +100,15 @@ public final class TypesTest {
} }
} }
@Test public void parameterizedTypeWithIncorrectOwnerProvided() throws Exception {
try {
Types.newParameterizedTypeWithOwner(A.class, D.class, B.class);
fail();
} catch (IllegalArgumentException expected) {
assertThat(expected).hasMessage("unexpected owner type for " + D.class + ": " + A.class);
}
}
@Test public void arrayOf() { @Test public void arrayOf() {
assertThat(Types.getRawType(Types.arrayOf(int.class))).isEqualTo(int[].class); assertThat(Types.getRawType(Types.arrayOf(int.class))).isEqualTo(int[].class);
assertThat(Types.getRawType(Types.arrayOf(List.class))).isEqualTo(List[].class); assertThat(Types.getRawType(Types.arrayOf(List.class))).isEqualTo(List[].class);
@@ -153,6 +162,9 @@ public final class TypesTest {
private static final class C { private static final class C {
} }
private static final class D<T> {
}
/** /**
* Given a parameterized type {@code A<B, C>}, returns B. If the specified type is not a generic * Given a parameterized type {@code A<B, C>}, returns B. If the specified type is not a generic
* type, returns null. * type, returns null.