Browse Source

Merge pull request #30423 from izeye

* pr/30423:
  Polish "Introduce internal constants for implicit bounds in TypeUtils"
  Introduce internal constants for implicit bounds in TypeUtils

Closes gh-30423
pull/30430/head
Stephane Nicoll 3 years ago
parent
commit
da37deec1b
  1. 14
      spring-core/src/main/java/org/springframework/util/TypeUtils.java

14
spring-core/src/main/java/org/springframework/util/TypeUtils.java

@ -36,6 +36,10 @@ import org.springframework.lang.Nullable; @@ -36,6 +36,10 @@ import org.springframework.lang.Nullable;
*/
public abstract class TypeUtils {
private static final Type[] IMPLICIT_LOWER_BOUNDS = { null };
private static final Type[] IMPLICIT_UPPER_BOUNDS = { Object.class };
/**
* Check if the right-hand side type may be assigned to the left-hand side
* type following the Java generics rules.
@ -196,20 +200,14 @@ public abstract class TypeUtils { @@ -196,20 +200,14 @@ public abstract class TypeUtils {
Type[] lowerBounds = wildcardType.getLowerBounds();
// supply the implicit lower bound if none are specified
if (lowerBounds.length == 0) {
lowerBounds = new Type[] { null };
}
return lowerBounds;
return (lowerBounds.length == 0 ? IMPLICIT_LOWER_BOUNDS : lowerBounds);
}
private static Type[] getUpperBounds(WildcardType wildcardType) {
Type[] upperBounds = wildcardType.getUpperBounds();
// supply the implicit upper bound if none are specified
if (upperBounds.length == 0) {
upperBounds = new Type[] { Object.class };
}
return upperBounds;
return (upperBounds.length == 0 ? IMPLICIT_UPPER_BOUNDS : upperBounds);
}
public static boolean isAssignableBound(@Nullable Type lhsType, @Nullable Type rhsType) {

Loading…
Cancel
Save