Skip to content

HHH-18714 add an explicit type check instead of the cast to raw #9542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 2, 2025
Merged

HHH-18714 add an explicit type check instead of the cast to raw #9542

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 37 additions & 60 deletions ...te-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import org.checkerframework.checker.nullness.qual.Nullable;

import org.hibernate.AnnotationException;
import org.hibernate.boot.model.NamedEntityGraphDefinition;
import org.hibernate.boot.query.NamedQueryDefinition;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
Expand Down Expand Up @@ -501,7 +502,7 @@ private void applyNamedEntityGraphs(Collection<NamedEntityGraphDefinition> named
}

final NamedEntityGraph namedEntityGraph = definition.getAnnotation();
final RootGraphImpl<?> entityGraph =
final RootGraphImplementor<?> entityGraph =
createEntityGraph(
namedEntityGraph,
definition.getRegisteredName(),
Expand All @@ -513,24 +514,26 @@ private void applyNamedEntityGraphs(Collection<NamedEntityGraphDefinition> named
}
}

private <T> RootGraphImpl<T> createEntityGraph(
private <T> RootGraphImplementor<T> createEntityGraph(
NamedEntityGraph namedEntityGraph,
String registeredName,
EntityDomainType<T> entityType,
boolean includeAllAttributes) {
final RootGraphImpl<T> entityGraph =
final RootGraphImplementor<T> entityGraph =
createRootGraph( registeredName, entityType, includeAllAttributes );

if ( namedEntityGraph.subclassSubgraphs() != null ) {
for ( var subclassSubgraph : namedEntityGraph.subclassSubgraphs() ) {
GraphImplementor<?> subgraph = (GraphImplementor<?>) entityGraph.addTreatedSubgraph(
(Class) subclassSubgraph.type() );

applyNamedAttributeNodes(
subclassSubgraph.attributeNodes(),
namedEntityGraph,
subgraph
);
for ( NamedSubgraph subclassSubgraph : namedEntityGraph.subclassSubgraphs() ) {
final Class<?> subgraphType = subclassSubgraph.type();
final Class<T> graphJavaType = entityGraph.getGraphedType().getJavaType();
if ( !graphJavaType.isAssignableFrom( subgraphType ) ) {
throw new AnnotationException( "Named subgraph type '" + subgraphType.getName()
+ "' is not a subtype of the graph type '" + graphJavaType.getName() + "'" );
}
@SuppressWarnings("unchecked") // Safe, because we just checked
final Class<? extends T> subtype = (Class<? extends T>) subgraphType;
final GraphImplementor<? extends T> subgraph = entityGraph.addTreatedSubgraph( subtype );
applyNamedAttributeNodes( subclassSubgraph.attributeNodes(), namedEntityGraph, subgraph );
}
}

Expand All @@ -541,7 +544,7 @@ private <T> RootGraphImpl<T> createEntityGraph(
return entityGraph;
}

private static <T> RootGraphImpl<T> createRootGraph(
private static <T> RootGraphImplementor<T> createRootGraph(
String name, EntityDomainType<T> entityType, boolean includeAllAttributes) {
final RootGraphImpl<T> entityGraph = new RootGraphImpl<>( name, entityType );
if ( includeAllAttributes ) {
Expand All @@ -558,8 +561,8 @@ private void applyNamedAttributeNodes(
GraphImplementor<?> graphNode) {
for ( NamedAttributeNode namedAttributeNode : namedAttributeNodes ) {
final String value = namedAttributeNode.value();
final AttributeNodeImplementor<?> attributeNode = (AttributeNodeImplementor<?>) graphNode.addAttributeNode(
value );
final AttributeNodeImplementor<?> attributeNode =
(AttributeNodeImplementor<?>) graphNode.addAttributeNode( value );

if ( isNotEmpty( namedAttributeNode.subgraph() ) ) {
applyNamedSubgraphs(
Expand All @@ -580,43 +583,36 @@ private void applyNamedAttributeNodes(
}
}

@SuppressWarnings({ "unchecked", "rawtypes" })
private <T> void applyNamedSubgraphs(
NamedEntityGraph namedEntityGraph,
String subgraphName,
AttributeNodeImplementor<T> attributeNode, Boolean isKeySubGraph) {
AttributeNodeImplementor<T> attributeNode,
boolean isKeySubGraph) {
for ( NamedSubgraph namedSubgraph : namedEntityGraph.subgraphs() ) {
if ( subgraphName.equals( namedSubgraph.name() ) ) {
final var isDefaultSubgraphType = namedSubgraph.type().equals( void.class );
final Class subGraphType = isDefaultSubgraphType ? null : namedSubgraph.type();

final SubGraphImplementor<?> subgraph = makeAttributeNodeSubgraph(
attributeNode, isKeySubGraph,
subGraphType
);

applyNamedAttributeNodes(
namedSubgraph.attributeNodes(),
namedEntityGraph,
subgraph
);
final boolean isDefaultSubgraphType = namedSubgraph.type().equals( void.class );
final Class<?> subGraphType = isDefaultSubgraphType ? null : namedSubgraph.type();
final SubGraphImplementor<?> subgraph =
makeAttributeNodeSubgraph( attributeNode, isKeySubGraph, subGraphType );
applyNamedAttributeNodes( namedSubgraph.attributeNodes(), namedEntityGraph, subgraph );
}
}
}

private static <T> SubGraphImplementor<?> makeAttributeNodeSubgraph(
AttributeNodeImplementor<T> attributeNode,
Boolean isKeySubGraph,
Class<T> subGraphType) {

boolean isKeySubGraph,
Class<?> subGraphType) {
if ( isKeySubGraph ) {
return subGraphType != null ? attributeNode.makeKeySubGraph( subGraphType )
return subGraphType != null
? attributeNode.makeKeySubGraph( subGraphType )
: attributeNode.makeKeySubGraph();
}

return subGraphType != null ?
attributeNode.makeSubGraph( subGraphType ) :
attributeNode.makeSubGraph();
else {
return subGraphType != null
? attributeNode.makeSubGraph( subGraphType )
: attributeNode.makeSubGraph();
}
}

private <X> Class<X> resolveRequestedClass(String entityName) {
Expand Down Expand Up @@ -783,30 +779,11 @@ public void processJpa(

private void populateStaticMetamodel(MetadataImplementor bootMetamodel, MetadataContext context) {
bootMetamodel.visitNamedHqlQueryDefinitions( definition
-> injectTypedQueryReference(
definition,
namedQueryMetamodelClass(
definition,
context
)
) );
-> injectTypedQueryReference( definition, namedQueryMetamodelClass( definition, context ) ) );
bootMetamodel.visitNamedNativeQueryDefinitions( definition
-> injectTypedQueryReference(
definition,
namedQueryMetamodelClass(
definition,
context
)
) );
-> injectTypedQueryReference( definition, namedQueryMetamodelClass( definition, context ) ) );
bootMetamodel.getNamedEntityGraphs().values().forEach( definition
-> injectEntityGraph(
definition,
graphMetamodelClass(
definition,
context
),
this
) );
-> injectEntityGraph( definition, graphMetamodelClass( definition, context ), this ) );
}

private Class<?> namedQueryMetamodelClass(NamedQueryDefinition<?> definition, MetadataContext context) {
Expand Down
Loading