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

HHH-17253 - Fix for StackOverflowError in static metamodel generator 

Signed-off-by: Jan Schatteman <jschatte@redhat.com>
This commit is contained in:
Jan Schatteman 2023-10-05 19:02:22 +02:00 committed by Christian Beikov
parent fc43836c7e
commit f8bfb85ce1
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@
package org.hibernate.jpamodelgen.util;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -121,7 +122,7 @@ public final class TypeUtils {
}
public static String extractClosestRealTypeAsString(TypeMirror type, Context context) {
final TypeMirror mirror = extractClosestRealType( type, context );
final TypeMirror mirror = extractClosestRealType( type, context, new HashSet<>() );
return mirror == null ? "?" : mirror.toString();
}
@ -133,22 +134,30 @@ public final class TypeUtils {
return bound == null || (bound.getKind() == TypeKind.DECLARED && bound.toString().equals("java.lang.Object")) ? null : bound;
}
public static @Nullable TypeMirror extractClosestRealType(TypeMirror type, Context context) {
public static @Nullable TypeMirror extractClosestRealType(TypeMirror type, Context context, Set<TypeVariable> beingVisited) {
if ( type == null ) {
return null;
}
switch ( type.getKind() ) {
case TYPEVAR:
final TypeVariable typeVariable = (TypeVariable) type;
return context.getTypeUtils().getWildcardType(
upperBound( extractClosestRealType( typeVariable.getUpperBound(), context ) ),
lowerBound( extractClosestRealType( typeVariable.getLowerBound(), context ) )
);
if ( !beingVisited.add( typeVariable ) ) {
// A self-referential type variable has to be represented as plain wildcard `?`
return context.getTypeUtils().getWildcardType( null, null );
}
else {
final WildcardType wildcardType = context.getTypeUtils().getWildcardType(
upperBound( extractClosestRealType( typeVariable.getUpperBound(), context, beingVisited ) ),
lowerBound( extractClosestRealType( typeVariable.getLowerBound(), context, beingVisited ) )
);
beingVisited.remove( typeVariable );
return wildcardType;
}
case WILDCARD:
final WildcardType wildcardType = (WildcardType) type;
return context.getTypeUtils().getWildcardType(
extractClosestRealType( wildcardType.getExtendsBound(), context ),
extractClosestRealType( wildcardType.getSuperBound(), context )
extractClosestRealType( wildcardType.getExtendsBound(), context, beingVisited ),
extractClosestRealType( wildcardType.getSuperBound(), context, beingVisited )
);
case DECLARED:
final DeclaredType declaredType = (DeclaredType) type;
@ -159,7 +168,7 @@ public final class TypeUtils {
.map( new Function<TypeMirror, TypeMirror>() {
@Override
public @Nullable TypeMirror apply(TypeMirror arg) {
return extractClosestRealType( arg, context );
return extractClosestRealType( arg, context, beingVisited );
}
} )
.toArray( TypeMirror[]::new )