Skip to content

Apply null annotations in org.hibernate.query.sqm.tree #11178

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

Jump to bottom
Merged
merged 1 commit into from
Nov 18, 2025
Merged

Apply null annotations in org.hibernate.query.sqm.tree #11178

merged 1 commit into from
Nov 18, 2025

Conversation

@beikov
Copy link
Member

@beikov beikov commented Oct 31, 2025

Fixed potential NPEs in/for:

  • ArrayViaElementArgumentReturnTypeResolver
  • SqmPathRegistry#resolveFrom
  • SqmCriteriaNodeBuilder#createNullifFunctionNode
  • SqmBasicValuedSimplePath#getJavaTypeClass
  • SqmWindowFrame methods equals/hashCode/isCompatible/cacheHashCode
  • SqmConflictUpdateAction#where
  • SqmDynamicInstantiation#checkInstantiation
  • SqmQuerySpec method setRestriction/setGroupRestriction/collectSelectedFromSet
  • SqmSubQuery#getTupleLength
  • AbstractSqmRestrictedDmlStatement#setWhere

Also:

  • Add SqmPathRegistry#resolveFromByPath to return non-null value contrary to findFromByPath
  • Cleanup SqmFieldLiteral implementation by extending AbstractSqmExpression
  • Respect jakarta.persistence.criteria.AbstractQuery#getResultType contract to be non-null
  • Respect HibernateCriteriaBuilder#unwrap contract to be non-null
  • Remove NullSqmExpressible in favor of using null, since the Parameter type is nullable anyway
  • Fix SqmFromClause#appendHqlString not handling certain types of Sqm root and join nodes
  • Fix AbstractSqmSelectQuery#getSelection to behave according to JPA spec
  • Fix SqmSubQuery methods getSelection/getCompoundSelectionItems/isCompoundSelection to behave according to JPA spec
  • Make SqmFromClause and SqmSelectClause in SqmQuerySpec final and non-null
  • Make SqmSetClause in SqmUpdateStatement non-null

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.

@hibernate-github-bot
Copy link

hibernate-github-bot bot commented Oct 31, 2025 •
edited
Loading

Thanks for your pull request!

This pull request does not follow the contribution rules. Could you have a look?

❌ All commit messages should start with a JIRA issue key matching pattern HHH-\d+
    ↳ Offending commits: [e4b71af]

› This message was automatically generated.

github-advanced-security[bot]
github-advanced-security bot found potential problems Oct 31, 2025
View reviewed changes
...re/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractIdentifiableType.java

@Override
public AbstractIdentifiableType<? super J> getSuperType() {
public @Nullable AbstractIdentifiableType<? super J> getSuperType() {

Check notice

Code scanning / CodeQL

Confusing method names because of capitalization

The method 'getSuperType' may be confused with [getSupertype](1).
hibernate-core/src/main/java/org/hibernate/query/criteria/JpaJoin.java

@Override
JpaJoin<L, R> on(Expression<Boolean> restriction);
JpaJoin<L, R> on(@Nullable Expression<Boolean> restriction);

Check notice

Code scanning / CodeQL

Confusing overloading of methods

Method JpaJoin.on(..) could be confused with overloaded method [on](1), since dispatch depends on static types.
hibernate-core/src/main/java/org/hibernate/query/criteria/JpaJoin.java

@Override
JpaJoin<L, R> on(Predicate... restrictions);
JpaJoin<L, R> on(Predicate @Nullable... restrictions);

Check notice

Code scanning / CodeQL

Confusing overloading of methods

Method JpaJoin.on(..) could be confused with overloaded method [on](1), since dispatch depends on static types.
hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java
JpaQueryStructure<T> setRestriction(@Nullable JpaPredicate restriction);

JpaQueryStructure<T> setRestriction(Expression<Boolean> restriction);
JpaQueryStructure<T> setRestriction(@Nullable Expression<Boolean> restriction);

Check notice

Code scanning / CodeQL

Confusing overloading of methods

Method JpaQueryStructure.setRestriction(..) could be confused with overloaded method [setRestriction](1), since dispatch depends on static types.
hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java
JpaQueryStructure<T> setGroupRestriction(@Nullable JpaPredicate restrictions);

JpaQueryStructure<T> setGroupRestriction(Expression<Boolean> restriction);
JpaQueryStructure<T> setGroupRestriction(@Nullable Expression<Boolean> restriction);

Check notice

Code scanning / CodeQL

Confusing overloading of methods

Method JpaQueryStructure.setGroupRestriction(..) could be confused with overloaded method [setGroupRestriction](1), since dispatch depends on static types.
hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java
return getRegisteredType( javaType.getTypeName() );
}

public <J> BasicType<J> getRegisteredType(Class<J> javaType) {
public <J> @Nullable BasicType<J> getRegisteredType(Class<J> javaType) {

Check notice

Code scanning / CodeQL

Confusing overloading of methods

Method BasicTypeRegistry.getRegisteredType(..) could be confused with overloaded method [getRegisteredType](1), since dispatch depends on static types.
hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java
SqmBindableType<?> firstType,
SqmBindableType<?> secondType,
public @Nullable SqmBindableType<?> resolveArithmeticType(
@Nullable SqmBindableType<?> firstType,

Check notice

Code scanning / CodeQL

Useless parameter

The parameter 'operator' is never used.
hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java
return type == null ? null
: getSqlTemporalType( type.getRelationalJavaType()
.getRecommendedJdbcType( getCurrentBaseSqlTypeIndicators() ) );

}

@SuppressWarnings("deprecation")
public static TemporalType getSqlTemporalType(JdbcMapping jdbcMapping) {
public static @Nullable TemporalType getSqlTemporalType(JdbcMapping jdbcMapping) {

Check notice

Code scanning / CodeQL

Confusing overloading of methods

Method TypeConfiguration.getSqlTemporalType(..) could be confused with overloaded method [getSqlTemporalType](1), since dispatch depends on static types. Method TypeConfiguration.getSqlTemporalType(..) could be confused with overloaded method [getSqlTemporalType](2), since dispatch depends on static types. Method TypeConfiguration.getSqlTemporalType(..) could be confused with overloaded method [getSqlTemporalType](3), since dispatch depends on static types.
hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java
return getSqlTemporalType( jdbcMapping.getJdbcType() );
}

@SuppressWarnings("deprecation")
public static TemporalType getSqlTemporalType(JdbcMappingContainer jdbcMappings) {
public static @Nullable TemporalType getSqlTemporalType(JdbcMappingContainer jdbcMappings) {

Check notice

Code scanning / CodeQL

Confusing overloading of methods

Method TypeConfiguration.getSqlTemporalType(..) could be confused with overloaded method [getSqlTemporalType](1), since dispatch depends on static types. Method TypeConfiguration.getSqlTemporalType(..) could be confused with overloaded method [getSqlTemporalType](2), since dispatch depends on static types.
hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java
assert jdbcMappings.getJdbcTypeCount() == 1;
return getSqlTemporalType( jdbcMappings.getSingleJdbcMapping().getJdbcType() );
}

@SuppressWarnings("deprecation")
public static TemporalType getSqlTemporalType(MappingModelExpressible<?> type) {
public static @Nullable TemporalType getSqlTemporalType(MappingModelExpressible<?> type) {

Check notice

Code scanning / CodeQL

Confusing overloading of methods

Method TypeConfiguration.getSqlTemporalType(..) could be confused with overloaded method [getSqlTemporalType](1), since dispatch depends on static types.
@beikov beikov force-pushed the sqm-null-annotations branch 4 times, most recently from 81f6097 to ab76089 Compare November 5, 2025 14:16
@beikov beikov force-pushed the sqm-null-annotations branch from ab76089 to 9d0afa0 Compare November 18, 2025 15:31
@beikov beikov force-pushed the sqm-null-annotations branch from 9d0afa0 to e4b71af Compare November 18, 2025 16:56
@beikov beikov merged commit 47a497c into hibernate:main Nov 18, 2025
2 of 4 checks passed
@beikov beikov deleted the sqm-null-annotations branch November 18, 2025 16:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@beikov