github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1818 - Cannot auto-generate UUID

Browse Source
This commit is contained in:
rob bygrave
2019-09-12 22:02:22 +12:00
parent a2b418df8b
commit c12ea28ea9
5 changed files with 126 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+9 -5
View File
@@ -202,12 +202,11 @@ public class AnnotationFields extends AnnotationParser {
prop.setDbColumn(dbColumn);
}
Id id = get(prop, Id.class);
GeneratedValue gen = get(prop, GeneratedValue.class);
if (gen != null) {
readGenValue(gen, prop);
readGenValue(gen, id, prop);
}
Id id = get(prop, Id.class);
if (id != null) {
readIdScalar(prop);
}
@@ -519,8 +518,13 @@ public class AnnotationFields extends AnnotationParser {
return util.createDataEncryptSupport(table, column);
}
private void readGenValue(GeneratedValue gen, DeployBeanProperty prop) {
private void readGenValue(GeneratedValue gen, Id id, DeployBeanProperty prop) {
if (id == null) {
if (UUID.class.equals(prop.getPropertyType())) {
generatedPropFactory.setUuid(prop);
return;
}
}
descriptor.setIdGeneratedValue();
String genName = gen.generator();