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

Merge pull request #475 from square/eric.resolve-generics

Browse Source 
Resolve generic property types in KotlinJsonAdapter.
This commit is contained in:
Jesse Wilson
2018-04-04 01:18:31 -04:00
committed by GitHub
parent 75f2d5c8dd dc450e6192
commit c1b93247e3
3 changed files with 52 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -373,7 +373,8 @@ public final class Types {
return new Type[] { Object.class, Object.class };
}
static Type resolve(Type context, Class<?> contextRawType, Type toResolve) {
@CheckReturnValue // TODO(eric): Move this to internal Utils.
public static Type resolve(Type context, Class<?> contextRawType, Type toResolve) {
// This implementation is made a little more complicated in an attempt to avoid object-creation.
while (true) {
if (toResolve instanceof TypeVariable) {