@@ -231,26 +231,23 @@ private static ParameterizedType translateParentTypeVars(ParameterizedType srcTy
231231 newParentArgs [i ] = parentTypeArgs [i ];
232232 }
233233 }
234- if (noChange && !(parentType instanceof ParameterizedTypeImpl )) noChange = false ;
235- return noChange
236- ? parentType
237- : new ParameterizedTypeImpl ((Class <?>) parentType .getRawType (), parentType .getOwnerType (), newParentArgs );
234+ if (noChange && !(parentType instanceof ParameterizedTypeImpl ))
235+ noChange = false ;
236+ return noChange ? parentType
237+ : new ParameterizedTypeImpl ((Class <?>) parentType .getRawType (), parentType .getOwnerType (), newParentArgs );
238238 }
239239
240240 private static Type canonicalize (Type type ) {
241241 if (type instanceof ParameterizedType ) {
242242 ParameterizedType p = (ParameterizedType ) type ;
243243 return new ParameterizedTypeImpl ((Class <?>) p .getRawType (), p .getOwnerType (), p .getActualTypeArguments ());
244- }
245- else if (type instanceof GenericArrayType ) {
244+ } else if (type instanceof GenericArrayType ) {
246245 GenericArrayType g = (GenericArrayType ) type ;
247246 return new GenericArrayTypeImpl (g .getGenericComponentType ());
248- }
249- else if (type instanceof WildcardType ) {
247+ } else if (type instanceof WildcardType ) {
250248 WildcardType w = (WildcardType ) type ;
251249 return new WildcardTypeImpl (w .getLowerBounds (), w .getUpperBounds ());
252- }
253- else {
250+ } else {
254251 return type ;
255252 }
256253 }
@@ -322,10 +319,8 @@ public String toString() {
322319 s .append (ownerType .getTypeName ()).append ("$" );
323320 if (ownerType instanceof ParameterizedTypeImpl ) {
324321 // remove prefixes that do not contain generic information
325- s .append (
326- rawType .getName ().replace (((ParameterizedTypeImpl ) ownerType ).rawType .getName () + "$" , "" ));
327- }
328- else {
322+ s .append (rawType .getName ().replace (((ParameterizedTypeImpl ) ownerType ).rawType .getName () + "$" , "" ));
323+ } else {
329324 s .append (rawType .getSimpleName ());
330325 }
331326 } else {
0 commit comments