From db17b832a4c985f23744a740a10d6c317bbffb5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= Date: Sun, 28 May 2023 09:36:30 +0800 Subject: [PATCH] optimize EnumWrapper.java --- .../com/mybatisflex/core/handler/FlexEnumTypeHandler.java | 6 +++--- .../main/java/com/mybatisflex/core/util/ConvertUtil.java | 2 +- .../main/java/com/mybatisflex/core/util/EnumWrapper.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/handler/FlexEnumTypeHandler.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/handler/FlexEnumTypeHandler.java index c819e2da..28fefa99 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/handler/FlexEnumTypeHandler.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/handler/FlexEnumTypeHandler.java @@ -49,7 +49,7 @@ public class FlexEnumTypeHandler> extends BaseTypeHandler { if (null == value && rs.wasNull()) { return null; } - return enumWrapper.toEnum(value); + return enumWrapper.getEnum(value); } @@ -59,7 +59,7 @@ public class FlexEnumTypeHandler> extends BaseTypeHandler { if (null == value && rs.wasNull()) { return null; } - return enumWrapper.toEnum(value); + return enumWrapper.getEnum(value); } @@ -69,7 +69,7 @@ public class FlexEnumTypeHandler> extends BaseTypeHandler { if (null == value && cs.wasNull()) { return null; } - return enumWrapper.toEnum(value); + return enumWrapper.getEnum(value); } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/ConvertUtil.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/ConvertUtil.java index 61147aeb..1e0ecfa1 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/ConvertUtil.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/ConvertUtil.java @@ -94,7 +94,7 @@ public class ConvertUtil { } else if (targetClass.isEnum()) { EnumWrapper enumWrapper = EnumWrapper.of(targetClass); if (enumWrapper.hasEnumValueAnnotation()) { - return enumWrapper.toEnum(value); + return enumWrapper.getEnum(value); } else if (value instanceof String) { return Enum.valueOf(targetClass, value.toString()); } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/EnumWrapper.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/EnumWrapper.java index 360d35ec..6dfd2cf9 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/EnumWrapper.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/EnumWrapper.java @@ -84,7 +84,7 @@ public class EnumWrapper> { } - public E toEnum(Object value) { + public E getEnum(Object value) { for (E e : enums) { if (value.equals(getEnumValue(e))) { return e;