Branch: refs/heads/wip/6.0 Home: https://github.com/hibernate/hibernate-orm Commit: 3ecc2550df3cd11eaf0c5ed166a270db83053cbf https://github.com/hibernate/hibernate-orm/commit/3ecc2550df3cd11eaf0c5ed... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2021-01-14 (Thu, 14 Jan 2021) Changed paths: M hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java M hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java M hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java M hibernate-core/src/main/java/org/hibernate/cache/internal/DefaultCacheKeysFactory.java M hibernate-core/src/main/java/org/hibernate/cache/internal/NaturalIdCacheKey.java M hibernate-core/src/main/java/org/hibernate/cache/internal/SimpleCacheKeysFactory.java M hibernate-core/src/main/java/org/hibernate/cache/spi/CacheKeysFactory.java M hibernate-core/src/main/java/org/hibernate/cache/spi/access/NaturalIdDataAccess.java M hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractNaturalIdDataAccess.java M hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadWriteAccess.java M hibernate-core/src/main/java/org/hibernate/engine/internal/AbstractEntityEntry.java M hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdXrefDelegate.java M hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java M hibernate-core/src/main/java/org/hibernate/engine/internal/TwoPhaseLoad.java M hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultResolveNaturalIdEventListener.java M hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderStandard.java M hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java M hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SimpleNaturalIdLoader.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NaturalIdMapping.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractNaturalIdMapping.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CompoundNaturalIdMapping.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java M hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java M hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityInitializer.java M hibernate-core/src/test/java/org/hibernate/cache/spi/NaturalIdCacheKeyTest.java Log Message: ----------- HHH-14409 : Internal format of natural-id values At the moment, internally the value of a natural-id is always kept as an array. For simple natural-ids that means creating an unnecessary array to wrap the simple value. Change this to allow Object to allow for these simple values