From e5906f18b28f905f90e93445609369d39ca39e65 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Sun, 12 Dec 2021 12:37:06 -0500 Subject: [PATCH] Spotless --- moshi/src/main/java/com/squareup/moshi/Types.java | 2 +- .../java/com/squareup/moshi/RecursiveTypesResolveTest.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/moshi/src/main/java/com/squareup/moshi/Types.java b/moshi/src/main/java/com/squareup/moshi/Types.java index 461890f79..19332e7d7 100644 --- a/moshi/src/main/java/com/squareup/moshi/Types.java +++ b/moshi/src/main/java/com/squareup/moshi/Types.java @@ -362,7 +362,7 @@ static Type[] mapKeyAndValueTypes(Type context, Class contextRawType) { static Type getSupertype(Type context, Class contextRawType, Class supertype) { if (!supertype.isAssignableFrom(contextRawType)) throw new IllegalArgumentException(); return resolve( - getGenericSupertype(context, contextRawType, supertype), context, contextRawType); + getGenericSupertype(context, contextRawType, supertype), context, contextRawType); } static Type getGenericSuperclass(Type type) { diff --git a/moshi/src/test/java/com/squareup/moshi/RecursiveTypesResolveTest.java b/moshi/src/test/java/com/squareup/moshi/RecursiveTypesResolveTest.java index 0cef1a9a6..b1a020392 100644 --- a/moshi/src/test/java/com/squareup/moshi/RecursiveTypesResolveTest.java +++ b/moshi/src/test/java/com/squareup/moshi/RecursiveTypesResolveTest.java @@ -23,8 +23,9 @@ import org.junit.Test; /** - * Test fixes for infinite recursion on {@link Util#resolve(java.lang.reflect.Type, java.lang.reflect.Type, Class)}, described at Issue - * #440 and similar issues. + * Test fixes for infinite recursion on {@link Util#resolve(java.lang.reflect.Type, + * java.lang.reflect.Type, Class)}, described at Issue #440 and similar issues. * *

These tests originally caused {@link StackOverflowError} because of infinite recursion on * attempts to resolve generics on types, with an intermediate types like 'Foo2<? extends ? super