diff --git a/pom.xml b/pom.xml index 295cb9b88..f6754546e 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ io.ebean ebean-annotation - 4.5 + 4.6 diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index 866ad4942..cf8308e68 100644 --- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java +++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -663,11 +663,10 @@ public final class DefaultTypeManager implements TypeManager { DbEnumValue dbValue = AnnotationUtil.findAnnotation(method, DbEnumValue.class); if (dbValue != null) { boolean integerValues = DbEnumType.INTEGER == dbValue.storage(); - return createEnumScalarTypeDbValue(enumType, method, integerValues); + return createEnumScalarTypeDbValue(enumType, method, integerValues, dbValue.length()); } } - // look for EnumValue annotations instead return createEnumScalarType2(enumType); } @@ -678,7 +677,7 @@ public final class DefaultTypeManager implements TypeManager { * Return null if the EnumValue annotations are not present/used. *

*/ - private ScalarTypeEnum createEnumScalarTypeDbValue(Class> enumType, Method method, boolean integerType) { + private ScalarTypeEnum createEnumScalarTypeDbValue(Class> enumType, Method method, boolean integerType, int length) { Map nameValueMap = new LinkedHashMap<>(); @@ -696,7 +695,7 @@ public final class DefaultTypeManager implements TypeManager { return null; } - return createEnumScalarType(enumType, nameValueMap, integerType, 0); + return createEnumScalarType(enumType, nameValueMap, integerType, length); } /** diff --git a/src/test/java/org/tests/model/basic/Truck.java b/src/test/java/org/tests/model/basic/Truck.java index b8d03b091..1c7778734 100644 --- a/src/test/java/org/tests/model/basic/Truck.java +++ b/src/test/java/org/tests/model/basic/Truck.java @@ -26,7 +26,7 @@ public class Truck extends Vehicle { this.value = value; } - @DbEnumValue + @DbEnumValue(length = 3) public String value() { return value; }