@ -76,7 +76,7 @@ class ResolvableTypeTests {
@@ -76,7 +76,7 @@ class ResolvableTypeTests {
@Test
void noneReturnValues ( ) throws Exception {
void noneReturnValues ( ) {
ResolvableType none = ResolvableType . NONE ;
assertThat ( none . as ( Object . class ) ) . isEqualTo ( ResolvableType . NONE ) ;
assertThat ( none . asCollection ( ) ) . isEqualTo ( ResolvableType . NONE ) ;
@ -99,7 +99,7 @@ class ResolvableTypeTests {
@@ -99,7 +99,7 @@ class ResolvableTypeTests {
}
@Test
void forClass ( ) throws Exception {
void forClass ( ) {
ResolvableType type = ResolvableType . forClass ( ExtendsList . class ) ;
assertThat ( type . getType ( ) ) . isEqualTo ( ExtendsList . class ) ;
assertThat ( type . getRawClass ( ) ) . isEqualTo ( ExtendsList . class ) ;
@ -108,7 +108,7 @@ class ResolvableTypeTests {
@@ -108,7 +108,7 @@ class ResolvableTypeTests {
}
@Test
void forClassWithNull ( ) throws Exception {
void forClassWithNull ( ) {
ResolvableType type = ResolvableType . forClass ( null ) ;
assertThat ( type . getType ( ) ) . isEqualTo ( Object . class ) ;
assertThat ( type . getRawClass ( ) ) . isEqualTo ( Object . class ) ;
@ -117,7 +117,7 @@ class ResolvableTypeTests {
@@ -117,7 +117,7 @@ class ResolvableTypeTests {
}
@Test
void forRawClass ( ) throws Exception {
void forRawClass ( ) {
ResolvableType type = ResolvableType . forRawClass ( ExtendsList . class ) ;
assertThat ( type . getType ( ) ) . isEqualTo ( ExtendsList . class ) ;
assertThat ( type . getRawClass ( ) ) . isEqualTo ( ExtendsList . class ) ;
@ -127,7 +127,7 @@ class ResolvableTypeTests {
@@ -127,7 +127,7 @@ class ResolvableTypeTests {
}
@Test
void forRawClassWithNull ( ) throws Exception {
void forRawClassWithNull ( ) {
ResolvableType type = ResolvableType . forRawClass ( null ) ;
assertThat ( type . getType ( ) ) . isEqualTo ( Object . class ) ;
assertThat ( type . getRawClass ( ) ) . isEqualTo ( Object . class ) ;
@ -137,7 +137,7 @@ class ResolvableTypeTests {
@@ -137,7 +137,7 @@ class ResolvableTypeTests {
}
@Test // gh-23321
void forRawClassAssignableFromTypeVariable ( ) throws Exception {
void forRawClassAssignableFromTypeVariable ( ) {
ResolvableType typeVariable = ResolvableType . forClass ( ExtendsList . class ) . as ( List . class ) . getGeneric ( ) ;
ResolvableType raw = ResolvableType . forRawClass ( CharSequence . class ) ;
assertThat ( raw . resolve ( ) ) . isEqualTo ( CharSequence . class ) ;
@ -149,26 +149,26 @@ class ResolvableTypeTests {
@@ -149,26 +149,26 @@ class ResolvableTypeTests {
}
@Test // gh-28776
void forInstanceNull ( ) throws Exception {
void forInstanceNull ( ) {
assertThat ( ResolvableType . forInstance ( null ) ) . isEqualTo ( ResolvableType . NONE ) ;
}
@Test
void forInstanceNoProvider ( ) throws Exception {
void forInstanceNoProvider ( ) {
ResolvableType type = ResolvableType . forInstance ( new Object ( ) ) ;
assertThat ( type . getType ( ) ) . isEqualTo ( Object . class ) ;
assertThat ( type . resolve ( ) ) . isEqualTo ( Object . class ) ;
}
@Test
void forInstanceProvider ( ) throws Exception {
void forInstanceProvider ( ) {
ResolvableType type = ResolvableType . forInstance ( new MyGenericInterfaceType < > ( String . class ) ) ;
assertThat ( type . getRawClass ( ) ) . isEqualTo ( MyGenericInterfaceType . class ) ;
assertThat ( type . getGeneric ( ) . resolve ( ) ) . isEqualTo ( String . class ) ;
}
@Test
void forInstanceProviderNull ( ) throws Exception {
void forInstanceProviderNull ( ) {
ResolvableType type = ResolvableType . forInstance ( new MyGenericInterfaceType < String > ( null ) ) ;
assertThat ( type . getType ( ) ) . isEqualTo ( MyGenericInterfaceType . class ) ;
assertThat ( type . resolve ( ) ) . isEqualTo ( MyGenericInterfaceType . class ) ;
@ -200,7 +200,7 @@ class ResolvableTypeTests {
@@ -200,7 +200,7 @@ class ResolvableTypeTests {
}
@Test
void forFieldMustNotBeNull ( ) throws Exception {
void forFieldMustNotBeNull ( ) {
assertThatIllegalArgumentException ( )
. isThrownBy ( ( ) - > ResolvableType . forField ( null ) )
. withMessage ( "Field must not be null" ) ;
@ -214,7 +214,7 @@ class ResolvableTypeTests {
@@ -214,7 +214,7 @@ class ResolvableTypeTests {
}
@Test
void forConstructorParameterMustNotBeNull ( ) throws Exception {
void forConstructorParameterMustNotBeNull ( ) {
assertThatIllegalArgumentException ( )
. isThrownBy ( ( ) - > ResolvableType . forConstructorParameter ( null , 0 ) )
. withMessage ( "Constructor must not be null" ) ;
@ -228,7 +228,7 @@ class ResolvableTypeTests {
@@ -228,7 +228,7 @@ class ResolvableTypeTests {
}
@Test
void forMethodParameterByIndexMustNotBeNull ( ) throws Exception {
void forMethodParameterByIndexMustNotBeNull ( ) {
assertThatIllegalArgumentException ( )
. isThrownBy ( ( ) - > ResolvableType . forMethodParameter ( null , 0 ) )
. withMessage ( "Method must not be null" ) ;
@ -268,7 +268,7 @@ class ResolvableTypeTests {
@@ -268,7 +268,7 @@ class ResolvableTypeTests {
}
@Test
void forMethodParameterMustNotBeNull ( ) throws Exception {
void forMethodParameterMustNotBeNull ( ) {
assertThatIllegalArgumentException ( )
. isThrownBy ( ( ) - > ResolvableType . forMethodParameter ( null ) )
. withMessage ( "MethodParameter must not be null" ) ;
@ -295,7 +295,7 @@ class ResolvableTypeTests {
@@ -295,7 +295,7 @@ class ResolvableTypeTests {
}
@Test
void forMethodReturnMustNotBeNull ( ) throws Exception {
void forMethodReturnMustNotBeNull ( ) {
assertThatIllegalArgumentException ( )
. isThrownBy ( ( ) - > ResolvableType . forMethodReturnType ( null ) )
. withMessage ( "Method must not be null" ) ;
@ -372,7 +372,7 @@ class ResolvableTypeTests {
@@ -372,7 +372,7 @@ class ResolvableTypeTests {
}
@Test
void getComponentTypeForVariableThatResolvesToGenericArray ( ) throws Exception {
void getComponentTypeForVariableThatResolvesToGenericArray ( ) {
ResolvableType type = ResolvableType . forClass ( ListOfGenericArray . class ) . asCollection ( ) . getGeneric ( ) ;
assertThat ( type . isArray ( ) ) . isTrue ( ) ;
assertThat ( type . getType ( ) ) . isInstanceOf ( TypeVariable . class ) ;
@ -381,21 +381,21 @@ class ResolvableTypeTests {
@@ -381,21 +381,21 @@ class ResolvableTypeTests {
}
@Test
void getComponentTypeForNonArray ( ) throws Exception {
void getComponentTypeForNonArray ( ) {
ResolvableType type = ResolvableType . forClass ( String . class ) ;
assertThat ( type . isArray ( ) ) . isFalse ( ) ;
assertThat ( type . getComponentType ( ) ) . isEqualTo ( ResolvableType . NONE ) ;
}
@Test
void asCollection ( ) throws Exception {
void asCollection ( ) {
ResolvableType type = ResolvableType . forClass ( ExtendsList . class ) . asCollection ( ) ;
assertThat ( type . resolve ( ) ) . isEqualTo ( Collection . class ) ;
assertThat ( type . resolveGeneric ( ) ) . isEqualTo ( CharSequence . class ) ;
}
@Test
void asMap ( ) throws Exception {
void asMap ( ) {
ResolvableType type = ResolvableType . forClass ( ExtendsMap . class ) . asMap ( ) ;
assertThat ( type . resolve ( ) ) . isEqualTo ( Map . class ) ;
assertThat ( type . resolveGeneric ( 0 ) ) . isEqualTo ( String . class ) ;
@ -403,43 +403,43 @@ class ResolvableTypeTests {
@@ -403,43 +403,43 @@ class ResolvableTypeTests {
}
@Test
void asFromInterface ( ) throws Exception {
void asFromInterface ( ) {
ResolvableType type = ResolvableType . forClass ( ExtendsList . class ) . as ( List . class ) ;
assertThat ( type . getType ( ) . toString ( ) ) . isEqualTo ( "java.util.List<E>" ) ;
}
@Test
void asFromInheritedInterface ( ) throws Exception {
void asFromInheritedInterface ( ) {
ResolvableType type = ResolvableType . forClass ( ExtendsList . class ) . as ( Collection . class ) ;
assertThat ( type . getType ( ) . toString ( ) ) . isEqualTo ( "java.util.Collection<E>" ) ;
}
@Test
void asFromSuperType ( ) throws Exception {
void asFromSuperType ( ) {
ResolvableType type = ResolvableType . forClass ( ExtendsList . class ) . as ( ArrayList . class ) ;
assertThat ( type . getType ( ) . toString ( ) ) . isEqualTo ( "java.util.ArrayList<java.lang.CharSequence>" ) ;
}
@Test
void asFromInheritedSuperType ( ) throws Exception {
void asFromInheritedSuperType ( ) {
ResolvableType type = ResolvableType . forClass ( ExtendsList . class ) . as ( List . class ) ;
assertThat ( type . getType ( ) . toString ( ) ) . isEqualTo ( "java.util.List<E>" ) ;
}
@Test
void asNotFound ( ) throws Exception {
void asNotFound ( ) {
ResolvableType type = ResolvableType . forClass ( ExtendsList . class ) . as ( Map . class ) ;
assertThat ( type ) . isSameAs ( ResolvableType . NONE ) ;
}
@Test
void asSelf ( ) throws Exception {
void asSelf ( ) {
ResolvableType type = ResolvableType . forClass ( ExtendsList . class ) ;
assertThat ( type . as ( ExtendsList . class ) ) . isEqualTo ( type ) ;
}
@Test
void getSuperType ( ) throws Exception {
void getSuperType ( ) {
ResolvableType type = ResolvableType . forClass ( ExtendsList . class ) . getSuperType ( ) ;
assertThat ( type . resolve ( ) ) . isEqualTo ( ArrayList . class ) ;
type = type . getSuperType ( ) ;
@ -451,7 +451,7 @@ class ResolvableTypeTests {
@@ -451,7 +451,7 @@ class ResolvableTypeTests {
}
@Test
void getInterfaces ( ) throws Exception {
void getInterfaces ( ) {
ResolvableType type = ResolvableType . forClass ( ExtendsList . class ) ;
assertThat ( type . getInterfaces ( ) ) . isEmpty ( ) ;
SortedSet < String > interfaces = new TreeSet < > ( ) ;
@ -464,13 +464,13 @@ class ResolvableTypeTests {
@@ -464,13 +464,13 @@ class ResolvableTypeTests {
}
@Test
void noSuperType ( ) throws Exception {
void noSuperType ( ) {
assertThat ( ResolvableType . forClass ( Object . class ) . getSuperType ( ) )
. isEqualTo ( ResolvableType . NONE ) ;
}
@Test
void noInterfaces ( ) throws Exception {
void noInterfaces ( ) {
assertThat ( ResolvableType . forClass ( Object . class ) . getInterfaces ( ) ) . isEmpty ( ) ;
}
@ -534,7 +534,7 @@ class ResolvableTypeTests {
@@ -534,7 +534,7 @@ class ResolvableTypeTests {
}
@Test
void getGenericOutOfBounds ( ) throws Exception {
void getGenericOutOfBounds ( ) {
ResolvableType type = ResolvableType . forClass ( List . class , ExtendsList . class ) ;
assertThat ( type . getGeneric ( 0 ) ) . isNotEqualTo ( ResolvableType . NONE ) ;
assertThat ( type . getGeneric ( 1 ) ) . isEqualTo ( ResolvableType . NONE ) ;
@ -542,14 +542,14 @@ class ResolvableTypeTests {
@@ -542,14 +542,14 @@ class ResolvableTypeTests {
}
@Test
void hasGenerics ( ) throws Exception {
void hasGenerics ( ) {
ResolvableType type = ResolvableType . forClass ( ExtendsList . class ) ;
assertThat ( type . hasGenerics ( ) ) . isFalse ( ) ;
assertThat ( type . asCollection ( ) . hasGenerics ( ) ) . isTrue ( ) ;
}
@Test
void getGenericsFromParameterizedType ( ) throws Exception {
void getGenericsFromParameterizedType ( ) {
ResolvableType type = ResolvableType . forClass ( List . class , ExtendsList . class ) ;
ResolvableType [ ] generics = type . getGenerics ( ) ;
assertThat ( generics ) . hasSize ( 1 ) ;
@ -557,7 +557,7 @@ class ResolvableTypeTests {
@@ -557,7 +557,7 @@ class ResolvableTypeTests {
}
@Test
void getGenericsFromClass ( ) throws Exception {
void getGenericsFromClass ( ) {
ResolvableType type = ResolvableType . forClass ( List . class ) ;
ResolvableType [ ] generics = type . getGenerics ( ) ;
assertThat ( generics ) . hasSize ( 1 ) ;
@ -565,14 +565,14 @@ class ResolvableTypeTests {
@@ -565,14 +565,14 @@ class ResolvableTypeTests {
}
@Test
void noGetGenerics ( ) throws Exception {
void noGetGenerics ( ) {
ResolvableType type = ResolvableType . forClass ( ExtendsList . class ) ;
ResolvableType [ ] generics = type . getGenerics ( ) ;
assertThat ( generics ) . isEmpty ( ) ;
}
@Test
void getResolvedGenerics ( ) throws Exception {
void getResolvedGenerics ( ) {
ResolvableType type = ResolvableType . forClass ( List . class , ExtendsList . class ) ;
Class < ? > [ ] generics = type . resolveGenerics ( ) ;
assertThat ( generics ) . hasSize ( 1 ) ;
@ -768,14 +768,14 @@ class ResolvableTypeTests {
@@ -768,14 +768,14 @@ class ResolvableTypeTests {
}
@Test
void resolveTypeVariableFromSuperType ( ) throws Exception {
void resolveTypeVariableFromSuperType ( ) {
ResolvableType type = ResolvableType . forClass ( ExtendsList . class ) ;
assertThat ( type . resolve ( ) ) . isEqualTo ( ExtendsList . class ) ;
assertThat ( type . asCollection ( ) . resolveGeneric ( ) ) . isEqualTo ( CharSequence . class ) ;
}
@Test
void resolveTypeVariableFromClassWithImplementsClass ( ) throws Exception {
void resolveTypeVariableFromClassWithImplementsClass ( ) {
ResolvableType type = ResolvableType . forClass (
MySuperclassType . class , MyCollectionSuperclassType . class ) ;
assertThat ( type . resolveGeneric ( ) ) . isEqualTo ( Collection . class ) ;
@ -971,7 +971,7 @@ class ResolvableTypeTests {
@@ -971,7 +971,7 @@ class ResolvableTypeTests {
}
@Test
void resolveFromClassWithGenerics ( ) throws Exception {
void resolveFromClassWithGenerics ( ) {
ResolvableType type = ResolvableType . forClassWithGenerics ( List . class , ResolvableType . forClassWithGenerics ( List . class , String . class ) ) ;
assertThat ( type . asCollection ( ) . toString ( ) ) . isEqualTo ( "java.util.Collection<java.util.List<java.lang.String>>" ) ;
assertThat ( type . asCollection ( ) . getGeneric ( ) . toString ( ) ) . isEqualTo ( "java.util.List<java.lang.String>" ) ;
@ -981,21 +981,21 @@ class ResolvableTypeTests {
@@ -981,21 +981,21 @@ class ResolvableTypeTests {
}
@Test
void isAssignableFromMustNotBeNull ( ) throws Exception {
void isAssignableFromMustNotBeNull ( ) {
assertThatIllegalArgumentException ( )
. isThrownBy ( ( ) - > ResolvableType . forClass ( Object . class ) . isAssignableFrom ( ( ResolvableType ) null ) )
. withMessage ( "ResolvableType must not be null" ) ;
}
@Test
void isAssignableFromForNone ( ) throws Exception {
void isAssignableFromForNone ( ) {
ResolvableType objectType = ResolvableType . forClass ( Object . class ) ;
assertThat ( objectType . isAssignableFrom ( ResolvableType . NONE ) ) . isFalse ( ) ;
assertThat ( ResolvableType . NONE . isAssignableFrom ( objectType ) ) . isFalse ( ) ;
}
@Test
void isAssignableFromForClassAndClass ( ) throws Exception {
void isAssignableFromForClassAndClass ( ) {
ResolvableType objectType = ResolvableType . forClass ( Object . class ) ;
ResolvableType charSequenceType = ResolvableType . forClass ( CharSequence . class ) ;
ResolvableType stringType = ResolvableType . forClass ( String . class ) ;
@ -1223,7 +1223,7 @@ class ResolvableTypeTests {
@@ -1223,7 +1223,7 @@ class ResolvableTypeTests {
}
@Test
void forClassWithGenerics ( ) throws Exception {
void forClassWithGenerics ( ) {
ResolvableType elementType = ResolvableType . forClassWithGenerics ( Map . class , Integer . class , String . class ) ;
ResolvableType listType = ResolvableType . forClassWithGenerics ( List . class , elementType ) ;
assertThat ( listType . toString ( ) ) . isEqualTo ( "java.util.List<java.util.Map<java.lang.Integer, java.lang.String>>" ) ;
@ -1232,13 +1232,13 @@ class ResolvableTypeTests {
@@ -1232,13 +1232,13 @@ class ResolvableTypeTests {
}
@Test
void classWithGenericsAs ( ) throws Exception {
void classWithGenericsAs ( ) {
ResolvableType type = ResolvableType . forClassWithGenerics ( MultiValueMap . class , Integer . class , String . class ) ;
assertThat ( type . asMap ( ) . toString ( ) ) . isEqualTo ( "java.util.Map<java.lang.Integer, java.util.List<java.lang.String>>" ) ;
}
@Test
void forClassWithMismatchedGenerics ( ) throws Exception {
void forClassWithMismatchedGenerics ( ) {
assertThatIllegalArgumentException ( )
. isThrownBy ( ( ) - > ResolvableType . forClassWithGenerics ( Map . class , Integer . class ) )
. withMessageContaining ( "Mismatched number of generics specified for" )
@ -1266,7 +1266,7 @@ class ResolvableTypeTests {
@@ -1266,7 +1266,7 @@ class ResolvableTypeTests {
}
@Test
void canResolveVoid ( ) throws Exception {
void canResolveVoid ( ) {
ResolvableType type = ResolvableType . forClass ( void . class ) ;
assertThat ( type . resolve ( ) ) . isEqualTo ( void . class ) ;
}
@ -1285,19 +1285,19 @@ class ResolvableTypeTests {
@@ -1285,19 +1285,19 @@ class ResolvableTypeTests {
}
@Test
void hasUnresolvableGenericsBasedOnOwnGenerics ( ) throws Exception {
void hasUnresolvableGenericsBasedOnOwnGenerics ( ) {
ResolvableType type = ResolvableType . forClass ( List . class ) ;
assertThat ( type . hasUnresolvableGenerics ( ) ) . isTrue ( ) ;
}
@Test
void hasUnresolvableGenericsWhenSelfNotResolvable ( ) throws Exception {
void hasUnresolvableGenericsWhenSelfNotResolvable ( ) {
ResolvableType type = ResolvableType . forClass ( List . class ) . getGeneric ( ) ;
assertThat ( type . hasUnresolvableGenerics ( ) ) . isFalse ( ) ;
}
@Test
void hasUnresolvableGenericsWhenImplementingRawInterface ( ) throws Exception {
void hasUnresolvableGenericsWhenImplementingRawInterface ( ) {
ResolvableType type = ResolvableType . forClass ( MySimpleInterfaceTypeWithImplementsRaw . class ) ;
for ( ResolvableType generic : type . getGenerics ( ) ) {
assertThat ( generic . resolve ( ) ) . isNotNull ( ) ;
@ -1306,7 +1306,7 @@ class ResolvableTypeTests {
@@ -1306,7 +1306,7 @@ class ResolvableTypeTests {
}
@Test
void hasUnresolvableGenericsWhenExtends ( ) throws Exception {
void hasUnresolvableGenericsWhenExtends ( ) {
ResolvableType type = ResolvableType . forClass ( ExtendsMySimpleInterfaceTypeWithImplementsRaw . class ) ;
for ( ResolvableType generic : type . getGenerics ( ) ) {
assertThat ( generic . resolve ( ) ) . isNotNull ( ) ;
@ -1322,7 +1322,7 @@ class ResolvableTypeTests {
@@ -1322,7 +1322,7 @@ class ResolvableTypeTests {
}
@Test
void spr12701 ( ) throws Exception {
void spr12701 ( ) {
ResolvableType resolvableType = ResolvableType . forClassWithGenerics ( Callable . class , String . class ) ;
Type type = resolvableType . getType ( ) ;
assertThat ( type ) . isInstanceOf ( ParameterizedType . class ) ;