diff --git a/spring-core/src/main/java/org/springframework/core/ResolvableType.java b/spring-core/src/main/java/org/springframework/core/ResolvableType.java index 51f4088c3e..c9dda29ff4 100644 --- a/spring-core/src/main/java/org/springframework/core/ResolvableType.java +++ b/spring-core/src/main/java/org/springframework/core/ResolvableType.java @@ -924,7 +924,7 @@ public class ResolvableType implements Serializable { * using the full generic type information for assignability checks. * For example: {@code ResolvableType.forClass(MyArrayList.class)}. * @param clazz the class to introspect ({@code null} is semantically - * equivalent to {@code Object.class} for typical use cases here} + * equivalent to {@code Object.class} for typical use cases here) * @return a {@link ResolvableType} for the specified class * @see #forClass(Class, Class) * @see #forClassWithGenerics(Class, Class...) @@ -939,7 +939,7 @@ public class ResolvableType implements Serializable { * {@link Class#isAssignableFrom}, which this serves as a wrapper for. * For example: {@code ResolvableType.forRawClass(List.class)}. * @param clazz the class to introspect ({@code null} is semantically - * equivalent to {@code Object.class} for typical use cases here} + * equivalent to {@code Object.class} for typical use cases here) * @return a {@link ResolvableType} for the specified class * @since 4.2 * @see #forClass(Class) @@ -1284,7 +1284,7 @@ public class ResolvableType implements Serializable { /** * Return a {@link ResolvableType} for the specified {@link Type}. - * Note: The resulting {@link ResolvableType} may not be {@link Serializable}. + *

Note: The resulting {@link ResolvableType} instance may not be {@link Serializable}. * @param type the source type (potentially {@code null}) * @return a {@link ResolvableType} for the specified {@link Type} * @see #forType(Type, ResolvableType) @@ -1295,7 +1295,8 @@ public class ResolvableType implements Serializable { /** * Return a {@link ResolvableType} for the specified {@link Type} backed by the given - * owner type. Note: The resulting {@link ResolvableType} may not be {@link Serializable}. + * owner type. + *

Note: The resulting {@link ResolvableType} instance may not be {@link Serializable}. * @param type the source type or {@code null} * @param owner the owner type used to resolve variables * @return a {@link ResolvableType} for the specified {@link Type} and owner @@ -1312,7 +1313,7 @@ public class ResolvableType implements Serializable { /** * Return a {@link ResolvableType} for the specified {@link ParameterizedTypeReference}. - * Note: The resulting {@link ResolvableType} may not be {@link Serializable}. + *

Note: The resulting {@link ResolvableType} instance may not be {@link Serializable}. * @param typeReference the reference to obtain the source type from * @return a {@link ResolvableType} for the specified {@link ParameterizedTypeReference} * @since 4.3.12 diff --git a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java index 67c1c7a598..db7e42d5c7 100644 --- a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java +++ b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -414,12 +414,8 @@ public class ResolvableTypeTests { interfaces.add(interfaceType.toString()); } assertThat(interfaces.toString(), equalTo( - "[" - + "java.io.Serializable, " - + "java.lang.Cloneable, " - + "java.util.List, " - + "java.util.RandomAccess" - + "]")); + "[java.io.Serializable, java.lang.Cloneable, " + + "java.util.List, java.util.RandomAccess]")); } @Test @@ -659,7 +655,7 @@ public class ResolvableTypeTests { @Test public void resolveBoundedTypeVariableResult() throws Exception { - ResolvableType type = ResolvableType.forMethodReturnType(Methods.class.getMethod("boundedTypeVaraibleResult")); + ResolvableType type = ResolvableType.forMethodReturnType(Methods.class.getMethod("boundedTypeVariableResult")); assertThat(type.resolve(), equalTo((Class) CharSequence.class)); } @@ -670,27 +666,14 @@ public class ResolvableTypeTests { } @Test - public void resolveTypeVaraibleFromMethodReturn() throws Exception { - ResolvableType type = ResolvableType.forMethodReturnType(Methods.class.getMethod("typedReturn")); - assertThat(type.resolve(), nullValue()); - } - - @Test - public void resolveTypeVaraibleFromMethodReturnWithInstanceClass() throws Exception { - ResolvableType type = ResolvableType.forMethodReturnType( - Methods.class.getMethod("typedReturn"), TypedMethods.class); - assertThat(type.resolve(), equalTo((Class) String.class)); - } - - @Test - public void resolveTypeVaraibleFromSimpleInterfaceType() { + public void resolveTypeVariableFromSimpleInterfaceType() { ResolvableType type = ResolvableType.forClass( MySimpleInterfaceType.class).as(MyInterfaceType.class); assertThat(type.resolveGeneric(), equalTo((Class) String.class)); } @Test - public void resolveTypeVaraibleFromSimpleCollectionInterfaceType() { + public void resolveTypeVariableFromSimpleCollectionInterfaceType() { ResolvableType type = ResolvableType.forClass( MyCollectionInterfaceType.class).as(MyInterfaceType.class); assertThat(type.resolveGeneric(), equalTo((Class) Collection.class)); @@ -698,14 +681,14 @@ public class ResolvableTypeTests { } @Test - public void resolveTypeVaraibleFromSimpleSuperclassType() { + public void resolveTypeVariableFromSimpleSuperclassType() { ResolvableType type = ResolvableType.forClass( MySimpleSuperclassType.class).as(MySuperclassType.class); assertThat(type.resolveGeneric(), equalTo((Class) String.class)); } @Test - public void resolveTypeVaraibleFromSimpleCollectionSuperclassType() { + public void resolveTypeVariableFromSimpleCollectionSuperclassType() { ResolvableType type = ResolvableType.forClass( MyCollectionSuperclassType.class).as(MySuperclassType.class); assertThat(type.resolveGeneric(), equalTo((Class) Collection.class)); @@ -1426,7 +1409,7 @@ public class ResolvableTypeTests { void charSequenceParameter(List cs); - R boundedTypeVaraibleResult(); + R boundedTypeVariableResult(); void nested(Map, Map> p);