[hibernate-commits] [hibernate/hibernate-orm] 65c0bf: HHH-20802 Support module-level annotations

Branch: refs/heads/main Home: https://github.com/hibernate/hibernate-orm Commit: 65c0bfcf6692f403906a435b41b4f4072e9fce6b https://github.com/hibernate/hibernate-orm/commit/65c0bfcf6692f403906a435... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2026-09-03 (Thu, 03 Sep 2026) Changed paths: M documentation/src/main/asciidoc/userguide/chapters/bootstrap/Bootstrap.adoc M documentation/src/main/asciidoc/userguide/chapters/events/Events.adoc M hibernate-core/hibernate-core.gradle M hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java M hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java M hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java M hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ManagedResourcesImpl.java M hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/ManagedResources.java M hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AdditionalManagedResourcesImpl.java M hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java M hibernate-core/src/main/java/org/hibernate/boot/scan/internal/ResultCollector.java M hibernate-core/src/main/java/org/hibernate/boot/scan/internal/ScanningResultImpl.java M hibernate-core/src/main/java/org/hibernate/boot/scan/spi/ScanningResult.java M hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java M hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/CallbackDefinitionResolver.java M hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/ModuleLevelAnnotationsTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/ModuleLevelEntityListenerTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/TestModuleUtil.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/EntityLevelListener.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/EventTracker.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/ExcludingEntity.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/ListenerEntity.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/ModuleListener.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/PackageListener.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/package-info.java M hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/BootstrapTest.java M hibernate-scan-jandex/src/main/java/org/hibernate/scan/jandex/IndexScanner.java Log Message: ----------- HHH-20802 Support module-level annotations Modules can now be registered via MetadataSources#addModule(Module), MetadataSources#addModule(String), or Configuration#addModule(Module). Annotations on module-info.java are processed the same way as package-info.java annotations. Jandex scanning auto-discovers modules from scanned archives. Module-level @EntityListeners are scoped to entities in that module, consistent with the JPA spec. Tests cover JPA module-level annotations (named queries, stored procedure queries) and entity listeners. The entity listener test verifies callback ordering (module > package > entity listener > entity callback) and that @ExcludeDefaultListeners does not exclude module or package level listeners. Assisted-By: Claude Code <noreply(a)anthropic.com&gt; Commit: 94bcaf9a69c9dd536842f24dd36a591212b893da https://github.com/hibernate/hibernate-orm/commit/94bcaf9a69c9dd536842f24... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2026-09-03 (Thu, 03 Sep 2026) Changed paths: M documentation/src/main/asciidoc/introduction/Advanced.adoc M hibernate-core/src/main/java/org/hibernate/annotations/CollectionTypeRegistration.java M hibernate-core/src/main/java/org/hibernate/annotations/CollectionTypeRegistrations.java M hibernate-core/src/main/java/org/hibernate/annotations/CompositeTypeRegistration.java M hibernate-core/src/main/java/org/hibernate/annotations/CompositeTypeRegistrations.java M hibernate-core/src/main/java/org/hibernate/annotations/ConverterRegistration.java M hibernate-core/src/main/java/org/hibernate/annotations/ConverterRegistrations.java M hibernate-core/src/main/java/org/hibernate/annotations/EmbeddableInstantiatorRegistration.java M hibernate-core/src/main/java/org/hibernate/annotations/EmbeddableInstantiatorRegistrations.java M hibernate-core/src/main/java/org/hibernate/annotations/FetchProfile.java M hibernate-core/src/main/java/org/hibernate/annotations/FetchProfiles.java M hibernate-core/src/main/java/org/hibernate/annotations/FilterDef.java M hibernate-core/src/main/java/org/hibernate/annotations/FilterDefs.java M hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerator.java M hibernate-core/src/main/java/org/hibernate/annotations/JavaTypeRegistration.java M hibernate-core/src/main/java/org/hibernate/annotations/JavaTypeRegistrations.java M hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeRegistration.java M hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeRegistrations.java M hibernate-core/src/main/java/org/hibernate/annotations/NamedEntityGraph.java M hibernate-core/src/main/java/org/hibernate/annotations/NamedEntityGraphs.java M hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java M hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java M hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java M hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java M hibernate-core/src/main/java/org/hibernate/annotations/NativeGenerator.java M hibernate-core/src/main/java/org/hibernate/annotations/TypeRegistration.java M hibernate-core/src/main/java/org/hibernate/annotations/TypeRegistrations.java M hibernate-core/src/main/java/org/hibernate/boot/model/internal/AbstractEntityIdGeneratorResolver.java M hibernate-core/src/main/java/org/hibernate/boot/models/HibernateAnnotations.java M hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/ModuleLevelAnnotationsTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/CollectionSubjectEntity.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/EmbeddableSubjectEntity.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/GeneratorSubjectEntity.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/StubCompositeUserType.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/StubConverter.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/StubDomainType.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/StubEmbeddable.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/StubEmbeddableInstantiator.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/StubJavaType.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/StubUserCollectionType.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/StubUserType.java A hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/SubjectEntity.java Log Message: ----------- HHH-20802 Add MODULE target to Hibernate-specific annotations Add ElementType.MODULE to @Target and Kind.MODULE to annotation descriptors for Hibernate annotations that mirror global JPA annotations (named queries, filter defs, type registrations, fetch profiles, etc.). AbstractEntityIdGeneratorResolver.handleAsMetaAnnotated() now walks to module-info after package-info for @IdGeneratorType meta-annotations (e.g. @GenericGenerator, @NativeGenerator). Tests cover all Hibernate-specific module-level annotations including type registrations, converter registrations, id generators, named queries, filter definitions, fetch profiles, and more. Assisted-By: Claude Code <noreply(a)anthropic.com&gt; Commit: a2a5a407df250eccbc9c75ad1b5a657c9bdd41f7 https://github.com/hibernate/hibernate-orm/commit/a2a5a407df250eccbc9c75a... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2026-09-03 (Thu, 03 Sep 2026) Changed paths: M hibernate-core/hibernate-core.gradle R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/ModuleLevelAnnotationsTest.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/ModuleLevelEntityListenerTest.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/TestModuleUtil.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/CollectionSubjectEntity.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/EmbeddableSubjectEntity.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/EntityLevelListener.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/EventTracker.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/ExcludingEntity.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/GeneratorSubjectEntity.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/ListenerEntity.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/ModuleListener.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/PackageListener.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/StubCompositeUserType.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/StubConverter.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/StubDomainType.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/StubEmbeddable.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/StubEmbeddableInstantiator.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/StubJavaType.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/StubUserCollectionType.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/StubUserType.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/SubjectEntity.java R hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/module/subject/package-info.java M hibernate-integrationtest-java-modules/src/test/java/module-info.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/ModuleLevelAnnotationsIT.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/ModuleLevelEntityListenerIT.java M hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/ScannerTest.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/annotation/CollectionSubjectEntity.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/annotation/CompositeSubjectEntity.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/annotation/ConverterSubjectEntity.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/annotation/EmbeddableSubjectEntity.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/annotation/ModuleAnnotationEntity.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/annotation/StubBasicType.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/annotation/StubCompositeType.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/annotation/StubCompositeUserType.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/annotation/StubConverter.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/annotation/StubConvertibleType.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/annotation/StubDomainType.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/annotation/StubEmbeddable.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/annotation/StubEmbeddableInstantiator.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/annotation/StubJavaType.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/annotation/StubUserCollectionType.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/annotation/StubUserType.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/annotation/TypeSubjectEntity.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/listener/EntityLevelListener.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/listener/EventTracker.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/listener/ExcludingEntity.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/listener/ListenerEntity.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/listener/ModuleListener.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/listener/PackageListener.java A hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/listener/package-info.java M hibernate-integrationtest-java-modules/src/test/resources/META-INF/persistence.xml Log Message: ----------- HHH-20802 Move module-level annotation tests to integration test module Move tests from hibernate-core (which required custom module layers, dynamic compilation, and JARs on the module path) to hibernate-integrationtest-java-modules where JPMS is natively enabled. This eliminates TestModuleUtil and its associated build hacks. Assisted-By: Claude Code <noreply(a)anthropic.com&gt; Commit: 28269654154f1045d6efc3d679eb5079a0e74e97 https://github.com/hibernate/hibernate-orm/commit/28269654154f1045d6efc3d... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2026-09-03 (Thu, 03 Sep 2026) Changed paths: M hibernate-core/src/main/java/org/hibernate/annotations/CollectionTypeRegistration.java M hibernate-core/src/main/java/org/hibernate/annotations/CompositeTypeRegistration.java M hibernate-core/src/main/java/org/hibernate/annotations/ConverterRegistration.java M hibernate-core/src/main/java/org/hibernate/annotations/EmbeddableInstantiatorRegistration.java M hibernate-core/src/main/java/org/hibernate/annotations/FetchProfile.java M hibernate-core/src/main/java/org/hibernate/annotations/FilterDef.java M hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerator.java M hibernate-core/src/main/java/org/hibernate/annotations/JavaTypeRegistration.java M hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeRegistration.java M hibernate-core/src/main/java/org/hibernate/annotations/NamedEntityGraph.java M hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java M hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java M hibernate-core/src/main/java/org/hibernate/annotations/NativeGenerator.java M hibernate-core/src/main/java/org/hibernate/annotations/TypeRegistration.java Log Message: ----------- HHH-20802 Document package-level and module-level placement of Hibernate-specific annotations in Javadoc Assisted-By: Claude Code <noreply(a)anthropic.com&gt; Commit: 72dc8c70b9771ed9e2ea22357296760d63ea0211 https://github.com/hibernate/hibernate-orm/commit/72dc8c70b9771ed9e2ea223... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2026-09-03 (Thu, 03 Sep 2026) Changed paths: M documentation/src/main/asciidoc/introduction/Advanced.adoc M documentation/src/main/asciidoc/introduction/Entities.adoc M documentation/src/main/asciidoc/introduction/Querying.adoc M documentation/src/main/asciidoc/userguide/chapters/domain/basic_types.adoc M documentation/src/main/asciidoc/userguide/chapters/domain/collections.adoc M documentation/src/main/asciidoc/userguide/chapters/domain/embeddables.adoc M documentation/src/main/asciidoc/userguide/chapters/fetching/Fetching.adoc M documentation/src/main/asciidoc/userguide/chapters/query/native/Native.adoc Log Message: ----------- HHH-20802 Document module-level annotation placement in user guide Assisted-By: Claude Code <noreply(a)anthropic.com&gt; Compare: https://github.com/hibernate/hibernate-orm/compare/35e807664553...72dc8c7... To unsubscribe from these emails, change your notification settings at https://github.com/hibernate/hibernate-orm/settings/notifications