Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-16515 - Get rid of nullness suppression in jpamodelgen TypeUtils 

Signed-off-by: Jan Schatteman <jschatte@redhat.com>
This commit is contained in:
Jan Schatteman 2023-08-24 17:24:21 +02:00 committed by Christian Beikov
parent 7ff76bf6eb
commit d325a5e90d
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
checkerstubs/javax.lang.astub Normal file
View File

@ -0,0 +1,11 @@
// Checkerframework stubs for javax.lang
package javax.lang.model.util;
import org.checkerframework.checker.nullness.qual.Nullable;
public interface Types {
public WildcardType getWildcardType(
@Nullable TypeMirror extendsBound,
@Nullable TypeMirror superBound);
}

25
tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/util/TypeUtils.java
View File

@ -10,6 +10,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.AnnotationValue;
import javax.lang.model.element.Element;
@ -124,16 +125,15 @@ public final class TypeUtils {
return mirror == null ? "?" : mirror.toString();
}
private static @Nullable TypeMirror lowerBound(TypeMirror bound) {
return bound.getKind() == TypeKind.NULL ? null : bound;
private static @Nullable TypeMirror lowerBound(@Nullable TypeMirror bound) {
return bound == null || bound.getKind() == TypeKind.NULL ? null : bound;
}
private static @Nullable TypeMirror upperBound(TypeMirror bound) {
return bound.getKind() == TypeKind.DECLARED && bound.toString().equals("java.lang.Object") ? null : bound;
private static @Nullable TypeMirror upperBound(@Nullable TypeMirror bound) {
return bound == null || (bound.getKind() == TypeKind.DECLARED && bound.toString().equals("java.lang.Object")) ? null : bound;
}
@SuppressWarnings("nullness")
public static TypeMirror extractClosestRealType(TypeMirror type, Context context) {
public static @Nullable TypeMirror extractClosestRealType(TypeMirror type, Context context) {
if ( type == null ) {
return null;
}
@ -153,10 +153,17 @@ public final class TypeUtils {
case DECLARED:
final DeclaredType declaredType = (DeclaredType) type;
final TypeElement typeElement = (TypeElement) declaredType.asElement();
return context.getTypeUtils().getDeclaredType( typeElement,
return context.getTypeUtils().getDeclaredType(
typeElement,
declaredType.getTypeArguments().stream()
.map( arg -> extractClosestRealType( arg, context ) )
.toArray( TypeMirror[]::new ) );
.map( new Function<TypeMirror, TypeMirror>() {
@Override
public @Nullable TypeMirror apply(TypeMirror arg) {
return extractClosestRealType( arg, context );
}
} )
.toArray( TypeMirror[]::new )
);
default:
return context.getTypeUtils().erasure( type );
}