Skip to content

check that arguments to special parameters of repository methods are non-null #10414

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
Jun 26, 2025
Merged

check that arguments to special parameters of repository methods are non-null #10414

Show file tree
Hide file tree
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
12 changes: 5 additions & 7 deletions ...el-generator/src/main/java/org/hibernate/processor/annotation/AbstractCriteriaMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public String getAttributeDeclarationString() {
modifiers( declaration );
preamble( declaration, paramTypes );
chainSession( declaration );
nullChecks( paramTypes, declaration );
nullChecks( declaration, paramTypes );
createBuilder(declaration);
createCriteriaQuery( declaration );
where( declaration, paramTypes );
Expand Down Expand Up @@ -145,12 +145,10 @@ private void createBuilder(StringBuilder declaration) {
.append(".getCriteriaBuilder();\n");
}

void nullChecks(List<String> paramTypes, StringBuilder declaration) {
for ( int i = 0; i< paramNames.size(); i++ ) {
final String paramName = paramNames.get(i);
final String paramType = paramTypes.get(i);
if ( !isNullable(i) && !isPrimitive(paramType) ) {
nullCheck( declaration, paramName );
void nullChecks(StringBuilder declaration, List<String> paramTypes) {
for ( int i = 0; i<paramNames.size(); i++ ) {
if ( isNonNull(i, paramTypes) ) {
nullCheck( declaration, paramNames.get(i) );
}
}
}
Expand Down
13 changes: 9 additions & 4 deletions ...model-generator/src/main/java/org/hibernate/processor/annotation/AbstractQueryMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,20 +162,25 @@ void parameters(List<String> paramTypes, StringBuilder declaration) {
declaration
.append(", ");
}
final String paramType = paramTypes.get(i);
if ( !isNullable(i) && !isPrimitive(paramType)
|| isSessionParameter(paramType) ) {
if ( isNonNull(i, paramTypes) ) {
notNull( declaration );
}
declaration
.append(annotationMetaEntity.importType(paramType))
.append(annotationMetaEntity.importType(paramTypes.get(i)))
.append(" ")
.append(parameterName(paramNames.get(i)));
}
declaration
.append(")");
}

boolean isNonNull(int i, List<String> paramTypes) {
final String paramType = paramTypes.get(i);
return !isNullable(i) && !isPrimitive(paramType)
|| isSessionParameter(paramType)
|| isSpecialParam(paramType);
}

static boolean isSessionParameter(String paramType) {
return SESSION_TYPES.contains(paramType);
}
Expand Down
15 changes: 13 additions & 2 deletions ...ing/metamodel-generator/src/main/java/org/hibernate/processor/annotation/QueryMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,9 @@ public String getAttributeDeclarationString() {
final List<String> paramTypes = parameterTypes();
final StringBuilder declaration = new StringBuilder();
comment( declaration );
modifiers( paramTypes, declaration );
modifiers( declaration, paramTypes );
preamble( declaration, paramTypes );
nullChecks( declaration, paramTypes );
createSpecification( declaration );
handleRestrictionParameters( declaration, paramTypes );
collectOrdering( declaration, paramTypes, containerType );
Expand Down Expand Up @@ -301,7 +302,7 @@ private void comment(StringBuilder declaration) {
.append("\n **/\n");
}

private void modifiers(List<String> paramTypes, StringBuilder declaration) {
private void modifiers(StringBuilder declaration, List<String> paramTypes) {
boolean hasVarargs = paramTypes.stream().anyMatch(ptype -> ptype.endsWith("..."));
if ( hasVarargs ) {
declaration
Expand All @@ -321,6 +322,16 @@ private void modifiers(List<String> paramTypes, StringBuilder declaration) {
}
}

void nullChecks(StringBuilder declaration, List<String> paramTypes) {
for ( int i = 0; i<paramNames.size(); i++ ) {
final String paramType = paramTypes.get( i );
// we don't do null checks on query parameters
if ( isSessionParameter( paramType ) || isSpecialParam( paramType) ) {
nullCheck( declaration, paramNames.get(i) );
}
}
}

@Override
public String getAttributeNameDeclarationString() {
StringBuilder declaration = new StringBuilder( queryString.length() + 200 );
Expand Down