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 ac5bfc8412..c018354430 100644 --- a/spring-core/src/main/java/org/springframework/core/ResolvableType.java +++ b/spring-core/src/main/java/org/springframework/core/ResolvableType.java @@ -973,7 +973,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) @@ -1320,7 +1320,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) @@ -1331,7 +1331,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 @@ -1348,7 +1349,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-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java index 96a7f8a1f8..eed90f59de 100644 --- a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java +++ b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java @@ -416,7 +416,6 @@ final class HierarchicalUriComponents extends UriComponents { @Override protected HierarchicalUriComponents expandInternal(UriTemplateVariables uriVariables) { - Assert.state(!this.encodeState.equals(EncodeState.FULLY_ENCODED), "URI components already encoded, and could not possibly contain '{' or '}'.");