Skip to content

HHH-19806 Make LoggingReportTask more resilient to missing annotation values #11001

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
Sep 25, 2025
Merged

HHH-19806 Make LoggingReportTask more resilient to missing annotation values #11001

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
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
description = "Miscellaneous logging related to Hibernate ORM Core"
)
@MessageLogger(projectCode = "HHH")
@ValidIdRange(max = 8000)
@ValidIdRange(min = 1, max = 8000)
@Internal
public interface CoreMessageLogger extends BasicLogger {

Expand Down
16 changes: 13 additions & 3 deletions local-build-plugins/src/main/java/org/hibernate/orm/post/LoggingReportTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.gradle.api.tasks.TaskAction;

import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationValue;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
import org.jboss.jandex.Index;
Expand Down Expand Up @@ -95,8 +96,8 @@ public void generateLoggingReport() {
}
else {
idRange = new IdRange(
idRangeAnnUsage.value( "min" ).asInt(),
idRangeAnnUsage.value( "max" ).asInt(),
asIntOrDefault( idRangeAnnUsage, "min" , 1 ),
asIntOrDefault( idRangeAnnUsage, "max" , 999999 ),
true,
loggerClassInfo.simpleName(),
subSystem
Expand Down Expand Up @@ -129,7 +130,7 @@ private IdRange calculateIdRange(AnnotationInstance msgLoggerAnnUsage, SubSystem

for ( int i = 0; i < messageAnnUsages.size(); i++ ) {
final AnnotationInstance msgAnnUsage = messageAnnUsages.get( i );
final int msgId = msgAnnUsage.value( "id" ).asInt();
final int msgId = asIntOrDefault( msgAnnUsage, "id", -1 );

if ( msgId < minId ) {
minId = msgId;
Expand Down Expand Up @@ -332,4 +333,13 @@ public String getLabel() {
return minValueText + " - " + maxValueText;
}
}

private int asIntOrDefault(AnnotationInstance instance, String param, int defaultValue) {
final AnnotationValue value = instance.value( param );
if ( value == null ) {
getLogger().warn( "Explicit value for [{}] was not provided at {}! ", param, instance.target() );
return defaultValue;
}
return value.asInt();
}
}
Loading