diff --git a/orm/src/main/java/com/zfoo/orm/codec/BaseTypeKeyMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/BaseTypeKeyMapCodec.java index 295186a7..776d8ca1 100644 --- a/orm/src/main/java/com/zfoo/orm/codec/BaseTypeKeyMapCodec.java +++ b/orm/src/main/java/com/zfoo/orm/codec/BaseTypeKeyMapCodec.java @@ -34,9 +34,7 @@ public class BaseTypeKeyMapCodec implements Codec> { for (var entry : map.entrySet()) { var key = entry.getKey(); var value = entry.getValue(); - MapKeyCodec codec = (MapKeyCodec) BaseTypeEnum.getCodec(keyCodec.getEncoderClass()); - String keyValue = codec.encode(key); - writer.writeName(keyValue); + writer.writeName(key.toString()); if (value == null) { writer.writeNull(); } else { diff --git a/orm/src/main/java/com/zfoo/orm/codec/MapKeyCodec.java b/orm/src/main/java/com/zfoo/orm/codec/MapKeyCodec.java index 5d7523c8..a9c4bbca 100644 --- a/orm/src/main/java/com/zfoo/orm/codec/MapKeyCodec.java +++ b/orm/src/main/java/com/zfoo/orm/codec/MapKeyCodec.java @@ -6,17 +6,8 @@ package com.zfoo.orm.codec; * @Date:2024/6/17 13:51 */ public interface MapKeyCodec { - /** - * 编码 - * @param value - * @return - */ - String encode(K value); - /** * 解析 - * @param text - * @return */ - K decode(String text); + K decode(String key); } diff --git a/orm/src/main/java/com/zfoo/orm/codec/basetype/BooleanMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/basetype/BooleanMapCodec.java index 832df574..e5a49d22 100644 --- a/orm/src/main/java/com/zfoo/orm/codec/basetype/BooleanMapCodec.java +++ b/orm/src/main/java/com/zfoo/orm/codec/basetype/BooleanMapCodec.java @@ -7,31 +7,9 @@ import com.zfoo.orm.codec.MapKeyCodec; * @Date:2024/6/17 11:32 */ public class BooleanMapCodec implements MapKeyCodec { - - @Override - public String encode(Boolean value) { - return value ? "True" : "False"; + public Boolean decode(String key) { + return Boolean.valueOf(key); } - @Override - public Boolean decode(String text) { - if (text == null) { - throw new java.lang.NullPointerException(); - } else if (isValidName(true, text)) { - return true; - } else if (isValidName(false, text)) { - return false; - } else { - throw new java.lang.IllegalArgumentException(text); - } - } - - private String getValidName(boolean value) { - return value ? "True" : "False"; - } - - private boolean isValidName(boolean value, String name) { - return getValidName(value).equalsIgnoreCase(name); - } } diff --git a/orm/src/main/java/com/zfoo/orm/codec/basetype/ByteMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/basetype/ByteMapCodec.java index fe234e76..73408df4 100644 --- a/orm/src/main/java/com/zfoo/orm/codec/basetype/ByteMapCodec.java +++ b/orm/src/main/java/com/zfoo/orm/codec/basetype/ByteMapCodec.java @@ -9,12 +9,7 @@ import com.zfoo.orm.codec.MapKeyCodec; */ public class ByteMapCodec implements MapKeyCodec { @Override - public String encode(Byte value) { - return value.toString(); - } - - @Override - public Byte decode(String text) { - return (text == null) ? null : Byte.decode(text); + public Byte decode(String key) { + return Byte.valueOf(key); } } diff --git a/orm/src/main/java/com/zfoo/orm/codec/basetype/CharacterMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/basetype/CharacterMapCodec.java index 58bfc72c..0b11b90c 100644 --- a/orm/src/main/java/com/zfoo/orm/codec/basetype/CharacterMapCodec.java +++ b/orm/src/main/java/com/zfoo/orm/codec/basetype/CharacterMapCodec.java @@ -1,7 +1,6 @@ package com.zfoo.orm.codec.basetype; import com.zfoo.orm.codec.MapKeyCodec; -import org.springframework.util.StringUtils; /** @@ -9,17 +8,10 @@ import org.springframework.util.StringUtils; * @Date:2024/6/17 11:34 */ public class CharacterMapCodec implements MapKeyCodec { - @Override - public String encode(Character value) { - return value.toString(); - } @Override - public Character decode(String text) { - if (!StringUtils.hasLength(text)) { - return null; - } else { - return text.charAt(0); - } + public Character decode(String key) { + return key.charAt(0); } + } diff --git a/orm/src/main/java/com/zfoo/orm/codec/basetype/DoubleMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/basetype/DoubleMapCodec.java index a39b8f6b..e6743974 100644 --- a/orm/src/main/java/com/zfoo/orm/codec/basetype/DoubleMapCodec.java +++ b/orm/src/main/java/com/zfoo/orm/codec/basetype/DoubleMapCodec.java @@ -9,12 +9,7 @@ import com.zfoo.orm.codec.MapKeyCodec; public class DoubleMapCodec implements MapKeyCodec { @Override - public String encode(Double value) { - return value.toString(); - } - - @Override - public Double decode(String text) { - return (text == null) ? null : Double.valueOf(text); + public Double decode(String key) { + return Double.valueOf(key); } } diff --git a/orm/src/main/java/com/zfoo/orm/codec/basetype/FloatMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/basetype/FloatMapCodec.java index 089900ad..5b6f1778 100644 --- a/orm/src/main/java/com/zfoo/orm/codec/basetype/FloatMapCodec.java +++ b/orm/src/main/java/com/zfoo/orm/codec/basetype/FloatMapCodec.java @@ -9,12 +9,7 @@ import com.zfoo.orm.codec.MapKeyCodec; public class FloatMapCodec implements MapKeyCodec { @Override - public String encode(Float value) { - return value.toString(); - } - - @Override - public Float decode(String text) { - return (text == null) ? null : Float.valueOf(text); + public Float decode(String key) { + return Float.valueOf(key); } } diff --git a/orm/src/main/java/com/zfoo/orm/codec/basetype/IntMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/basetype/IntMapCodec.java index 2e9e8a6e..f5d54f48 100644 --- a/orm/src/main/java/com/zfoo/orm/codec/basetype/IntMapCodec.java +++ b/orm/src/main/java/com/zfoo/orm/codec/basetype/IntMapCodec.java @@ -10,14 +10,8 @@ import com.zfoo.orm.codec.MapKeyCodec; */ public class IntMapCodec implements MapKeyCodec { - @Override - public String encode(Integer value) { - return value.toString(); - } - - @Override - public Integer decode(String text) { - return (text == null) ? null : Integer.parseInt(text); + public Integer decode(String key) { + return Integer.valueOf(key); } } diff --git a/orm/src/main/java/com/zfoo/orm/codec/basetype/LongMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/basetype/LongMapCodec.java index be15c9a5..d0f0f5cc 100644 --- a/orm/src/main/java/com/zfoo/orm/codec/basetype/LongMapCodec.java +++ b/orm/src/main/java/com/zfoo/orm/codec/basetype/LongMapCodec.java @@ -10,14 +10,8 @@ import com.zfoo.orm.codec.MapKeyCodec; */ public class LongMapCodec implements MapKeyCodec { - @Override - public String encode(Long value) { - return value.toString(); - } - - @Override - public Long decode(String text) { - return (text == null) ? null : Long.parseLong(text); + public Long decode(String key) { + return Long.valueOf(key); } } diff --git a/orm/src/main/java/com/zfoo/orm/codec/basetype/ShortMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/basetype/ShortMapCodec.java index cbf5c6e2..cdad2085 100644 --- a/orm/src/main/java/com/zfoo/orm/codec/basetype/ShortMapCodec.java +++ b/orm/src/main/java/com/zfoo/orm/codec/basetype/ShortMapCodec.java @@ -8,12 +8,7 @@ import com.zfoo.orm.codec.MapKeyCodec; */ public class ShortMapCodec implements MapKeyCodec { @Override - public String encode(Short value) { - return value.toString(); - } - - @Override - public Short decode(String text) { - return (text == null) ? null : Short.parseShort(text); + public Short decode(String key) { + return Short.valueOf(key); } }