Branch: refs/heads/main Home: https://github.com/hibernate/hibernate-orm Commit: 452f114957f69346c444819d9487414fa983fd17 https://github.com/hibernate/hibernate-orm/commit/452f114957f69346c444819... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2021-12-30 (Thu, 30 Dec 2021) Changed paths: M hibernate-core/src/main/java/org/hibernate/annotations/CollectionType.java M hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/BagBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/ListBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/MapBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/SetBinder.java M hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractBagSemantics.java M hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractMapSemantics.java M hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractSetSemantics.java M hibernate-core/src/main/java/org/hibernate/collection/internal/CustomCollectionTypeSemantics.java M hibernate-core/src/main/java/org/hibernate/collection/internal/StandardArraySemantics.java M hibernate-core/src/main/java/org/hibernate/collection/internal/StandardListSemantics.java M hibernate-core/src/main/java/org/hibernate/collection/spi/CollectionSemantics.java A hibernate-core/src/main/java/org/hibernate/collection/spi/InitializerProducerBuilder.java M hibernate-core/src/main/java/org/hibernate/mapping/Array.java M hibernate-core/src/main/java/org/hibernate/mapping/Bag.java M hibernate-core/src/main/java/org/hibernate/mapping/Collection.java M hibernate-core/src/main/java/org/hibernate/mapping/Filterable.java M hibernate-core/src/main/java/org/hibernate/mapping/IdentifierBag.java M hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java M hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java M hibernate-core/src/main/java/org/hibernate/mapping/List.java M hibernate-core/src/main/java/org/hibernate/mapping/Map.java M hibernate-core/src/main/java/org/hibernate/mapping/PrimitiveArray.java A hibernate-core/src/main/java/org/hibernate/mapping/SemanticsResolver.java M hibernate-core/src/main/java/org/hibernate/mapping/Set.java M hibernate-core/src/test/java/org/hibernate/orm/test/cfg/annotations/CollectionBinderTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SortAndOrderTests.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/basic/Email.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/basic/IMyList.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/basic/MyList.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/basic/MyListType.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/basic/PersistentMyList.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/basic/User.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/basic/UserCollectionTypeAnnotationsVariantTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/basic/UserCollectionTypeHbmVariantTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/basic/UserCollectionTypeTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/basic/UserPermissions.hbm.xml A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/Email.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/HeadList.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/HeadListType.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/IHeadList.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/PersistentHeadList.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/User.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/UserCollectionTypeAnnotationsVariantTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/UserCollectionTypeHbmVariantTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/UserCollectionTypeTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/UserPermissions.hbm.xml A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/UserWithUnimplementedCollection.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/UserWithUnimplementedCollectionTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/explicitsemantics/Email.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/explicitsemantics/HeadSetList.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/explicitsemantics/HeadSetListType.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/explicitsemantics/IHeadSetList.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/explicitsemantics/PersistentHeadList.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/explicitsemantics/User.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/declaredtype/explicitsemantics/UserCollectionTypeTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/parameterized/DefaultableList.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/parameterized/DefaultableListImpl.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/parameterized/DefaultableListType.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/parameterized/Entity.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/parameterized/Mapping.hbm.xml A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/parameterized/ParameterizedUserCollectionTypeAnnotationsVariantTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/parameterized/ParameterizedUserCollectionTypeHbmVariantTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/parameterized/ParameterizedUserCollectionTypeTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/collection/custom/parameterized/PersistentDefaultableList.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/Email.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/IMyList.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/MyList.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/MyListType.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/PersistentMyList.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/User.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeAnnotationsVariantTest.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeHbmVariantTest.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeTest.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserPermissions.hbm.xml R hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/Email.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/UserCollectionTypeAnnotationsVariantTest.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/UserCollectionTypeHbmVariantTest.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/UserCollectionTypeTest.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/UserPermissions.hbm.xml R hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/UserWithUnimplementedCollection.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/UserWithUnimplementedCollectionTest.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/explicitsemantics/UserCollectionTypeTest.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/DefaultableList.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/DefaultableListImpl.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/DefaultableListType.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/Entity.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/Mapping.hbm.xml R hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeAnnotationsVariantTest.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeHbmVariantTest.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeTest.java R hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/PersistentDefaultableList.java Log Message: ----------- `@CollectionType` + better CollectionSemantics resolution handling from annotations; HHH-9688 - Combination of @OrderBy and @SortComparator HHH-9688 was simple change in the code I was working on already, so went ahead and just did it