From 2a6c60c89b936eee515afc592e11c8b2ffeb3031 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 20 Jan 2023 08:27:09 +1300 Subject: [PATCH] #2915 - Fix for generator param of @GeneratedValue is not ignored when using GenerationType.AUTO on db where this uses identity --- .../ebeaninternal/server/deploy/parse/AnnotationFields.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java index b2b0a4dd7..e4a3fca8c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java @@ -465,10 +465,9 @@ final class AnnotationFields extends AnnotationParser { if (!gen.generator().isEmpty()) { // use a custom IdGenerator PlatformIdGenerator idGenerator = generatedPropFactory.getIdGenerator(gen.generator()); - if (idGenerator == null) { - throw new IllegalStateException("No custom IdGenerator registered with name " + gen.generator()); + if (idGenerator != null) { + descriptor.setCustomIdGenerator(idGenerator); } - descriptor.setCustomIdGenerator(idGenerator); } else if (prop.getPropertyType().equals(UUID.class)) { descriptor.setUuidGenerator(); }