From f25a6d2467d8c899e918e1beadfaac127d6c26cd Mon Sep 17 00:00:00 2001 From: godotg Date: Fri, 19 Jul 2024 21:48:47 +0800 Subject: [PATCH] ref[storage]: refactor convert --- .../storage/{strategy => convert}/ArrayConverter.java | 3 +-- .../com/zfoo/storage/{util => convert}/ConvertUtils.java | 3 +-- .../storage/{strategy => convert}/JsonToMapConverter.java | 2 +- .../{strategy => convert}/JsonToObjectConverter.java | 2 +- .../zfoo/storage/{strategy => convert}/ListConverter.java | 3 +-- .../zfoo/storage/{strategy => convert}/SetConverter.java | 3 +-- .../{strategy => convert}/StringToClassConverter.java | 2 +- .../{strategy => convert}/StringToDateConverter.java | 2 +- .../{strategy => convert}/StringToMapConverter.java | 2 +- .../com/zfoo/storage/interpreter/ResourceInterpreter.java | 2 +- .../java/com/zfoo/storage/conversion/ConversionTest.java | 8 ++++---- 11 files changed, 14 insertions(+), 18 deletions(-) rename storage/src/main/java/com/zfoo/storage/{strategy => convert}/ArrayConverter.java (96%) rename storage/src/main/java/com/zfoo/storage/{util => convert}/ConvertUtils.java (98%) rename storage/src/main/java/com/zfoo/storage/{strategy => convert}/JsonToMapConverter.java (97%) rename storage/src/main/java/com/zfoo/storage/{strategy => convert}/JsonToObjectConverter.java (98%) rename storage/src/main/java/com/zfoo/storage/{strategy => convert}/ListConverter.java (96%) rename storage/src/main/java/com/zfoo/storage/{strategy => convert}/SetConverter.java (96%) rename storage/src/main/java/com/zfoo/storage/{strategy => convert}/StringToClassConverter.java (97%) rename storage/src/main/java/com/zfoo/storage/{strategy => convert}/StringToDateConverter.java (97%) rename storage/src/main/java/com/zfoo/storage/{strategy => convert}/StringToMapConverter.java (96%) diff --git a/storage/src/main/java/com/zfoo/storage/strategy/ArrayConverter.java b/storage/src/main/java/com/zfoo/storage/convert/ArrayConverter.java similarity index 96% rename from storage/src/main/java/com/zfoo/storage/strategy/ArrayConverter.java rename to storage/src/main/java/com/zfoo/storage/convert/ArrayConverter.java index 3765b0be..58e8787e 100644 --- a/storage/src/main/java/com/zfoo/storage/strategy/ArrayConverter.java +++ b/storage/src/main/java/com/zfoo/storage/convert/ArrayConverter.java @@ -11,11 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.storage.strategy; +package com.zfoo.storage.convert; import com.zfoo.protocol.util.JsonUtils; import com.zfoo.protocol.util.StringUtils; -import com.zfoo.storage.util.ConvertUtils; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.converter.ConditionalGenericConverter; diff --git a/storage/src/main/java/com/zfoo/storage/util/ConvertUtils.java b/storage/src/main/java/com/zfoo/storage/convert/ConvertUtils.java similarity index 98% rename from storage/src/main/java/com/zfoo/storage/util/ConvertUtils.java rename to storage/src/main/java/com/zfoo/storage/convert/ConvertUtils.java index 8770b702..03ad3f27 100644 --- a/storage/src/main/java/com/zfoo/storage/util/ConvertUtils.java +++ b/storage/src/main/java/com/zfoo/storage/convert/ConvertUtils.java @@ -10,10 +10,9 @@ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.storage.util; +package com.zfoo.storage.convert; import com.zfoo.protocol.util.StringUtils; -import com.zfoo.storage.strategy.*; import org.springframework.context.support.ConversionServiceFactoryBean; import org.springframework.core.convert.TypeDescriptor; diff --git a/storage/src/main/java/com/zfoo/storage/strategy/JsonToMapConverter.java b/storage/src/main/java/com/zfoo/storage/convert/JsonToMapConverter.java similarity index 97% rename from storage/src/main/java/com/zfoo/storage/strategy/JsonToMapConverter.java rename to storage/src/main/java/com/zfoo/storage/convert/JsonToMapConverter.java index 156dbaf3..c209bd04 100644 --- a/storage/src/main/java/com/zfoo/storage/strategy/JsonToMapConverter.java +++ b/storage/src/main/java/com/zfoo/storage/convert/JsonToMapConverter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.storage.strategy; +package com.zfoo.storage.convert; import com.zfoo.protocol.util.JsonUtils; import org.springframework.core.convert.TypeDescriptor; diff --git a/storage/src/main/java/com/zfoo/storage/strategy/JsonToObjectConverter.java b/storage/src/main/java/com/zfoo/storage/convert/JsonToObjectConverter.java similarity index 98% rename from storage/src/main/java/com/zfoo/storage/strategy/JsonToObjectConverter.java rename to storage/src/main/java/com/zfoo/storage/convert/JsonToObjectConverter.java index b09bc1f3..ff696a1a 100644 --- a/storage/src/main/java/com/zfoo/storage/strategy/JsonToObjectConverter.java +++ b/storage/src/main/java/com/zfoo/storage/convert/JsonToObjectConverter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.storage.strategy; +package com.zfoo.storage.convert; import com.zfoo.protocol.util.JsonUtils; import com.zfoo.protocol.util.ReflectionUtils; diff --git a/storage/src/main/java/com/zfoo/storage/strategy/ListConverter.java b/storage/src/main/java/com/zfoo/storage/convert/ListConverter.java similarity index 96% rename from storage/src/main/java/com/zfoo/storage/strategy/ListConverter.java rename to storage/src/main/java/com/zfoo/storage/convert/ListConverter.java index e9d231a7..7bb84744 100644 --- a/storage/src/main/java/com/zfoo/storage/strategy/ListConverter.java +++ b/storage/src/main/java/com/zfoo/storage/convert/ListConverter.java @@ -11,11 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.storage.strategy; +package com.zfoo.storage.convert; import com.zfoo.protocol.util.JsonUtils; import com.zfoo.protocol.util.StringUtils; -import com.zfoo.storage.util.ConvertUtils; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.converter.ConditionalGenericConverter; import org.springframework.lang.NonNull; diff --git a/storage/src/main/java/com/zfoo/storage/strategy/SetConverter.java b/storage/src/main/java/com/zfoo/storage/convert/SetConverter.java similarity index 96% rename from storage/src/main/java/com/zfoo/storage/strategy/SetConverter.java rename to storage/src/main/java/com/zfoo/storage/convert/SetConverter.java index 0d2a71dc..133acb19 100644 --- a/storage/src/main/java/com/zfoo/storage/strategy/SetConverter.java +++ b/storage/src/main/java/com/zfoo/storage/convert/SetConverter.java @@ -11,11 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.storage.strategy; +package com.zfoo.storage.convert; import com.zfoo.protocol.util.JsonUtils; import com.zfoo.protocol.util.StringUtils; -import com.zfoo.storage.util.ConvertUtils; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.converter.ConditionalGenericConverter; import org.springframework.lang.NonNull; diff --git a/storage/src/main/java/com/zfoo/storage/strategy/StringToClassConverter.java b/storage/src/main/java/com/zfoo/storage/convert/StringToClassConverter.java similarity index 97% rename from storage/src/main/java/com/zfoo/storage/strategy/StringToClassConverter.java rename to storage/src/main/java/com/zfoo/storage/convert/StringToClassConverter.java index 908d4d50..71295852 100644 --- a/storage/src/main/java/com/zfoo/storage/strategy/StringToClassConverter.java +++ b/storage/src/main/java/com/zfoo/storage/convert/StringToClassConverter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.storage.strategy; +package com.zfoo.storage.convert; import com.zfoo.protocol.util.ClassUtils; import com.zfoo.protocol.util.StringUtils; diff --git a/storage/src/main/java/com/zfoo/storage/strategy/StringToDateConverter.java b/storage/src/main/java/com/zfoo/storage/convert/StringToDateConverter.java similarity index 97% rename from storage/src/main/java/com/zfoo/storage/strategy/StringToDateConverter.java rename to storage/src/main/java/com/zfoo/storage/convert/StringToDateConverter.java index 34274355..fa921fac 100644 --- a/storage/src/main/java/com/zfoo/storage/strategy/StringToDateConverter.java +++ b/storage/src/main/java/com/zfoo/storage/convert/StringToDateConverter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.storage.strategy; +package com.zfoo.storage.convert; import com.zfoo.protocol.util.StringUtils; import org.springframework.core.convert.converter.Converter; diff --git a/storage/src/main/java/com/zfoo/storage/strategy/StringToMapConverter.java b/storage/src/main/java/com/zfoo/storage/convert/StringToMapConverter.java similarity index 96% rename from storage/src/main/java/com/zfoo/storage/strategy/StringToMapConverter.java rename to storage/src/main/java/com/zfoo/storage/convert/StringToMapConverter.java index 7907833e..de62deb6 100644 --- a/storage/src/main/java/com/zfoo/storage/strategy/StringToMapConverter.java +++ b/storage/src/main/java/com/zfoo/storage/convert/StringToMapConverter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.storage.strategy; +package com.zfoo.storage.convert; import com.zfoo.protocol.util.JsonUtils; import org.springframework.core.convert.converter.Converter; diff --git a/storage/src/main/java/com/zfoo/storage/interpreter/ResourceInterpreter.java b/storage/src/main/java/com/zfoo/storage/interpreter/ResourceInterpreter.java index 6059a6ea..e981ce7b 100644 --- a/storage/src/main/java/com/zfoo/storage/interpreter/ResourceInterpreter.java +++ b/storage/src/main/java/com/zfoo/storage/interpreter/ResourceInterpreter.java @@ -17,9 +17,9 @@ import com.zfoo.protocol.util.ReflectionUtils; import com.zfoo.protocol.util.StringUtils; import com.zfoo.storage.anno.AliasFieldName; import com.zfoo.storage.anno.Id; +import com.zfoo.storage.convert.ConvertUtils; import com.zfoo.storage.interpreter.data.StorageData; import com.zfoo.storage.interpreter.data.StorageEnum; -import com.zfoo.storage.util.ConvertUtils; import java.io.IOException; import java.io.InputStream; diff --git a/storage/src/test/java/com/zfoo/storage/conversion/ConversionTest.java b/storage/src/test/java/com/zfoo/storage/conversion/ConversionTest.java index eb931235..263633e3 100644 --- a/storage/src/test/java/com/zfoo/storage/conversion/ConversionTest.java +++ b/storage/src/test/java/com/zfoo/storage/conversion/ConversionTest.java @@ -13,10 +13,10 @@ package com.zfoo.storage.conversion; -import com.zfoo.storage.strategy.ArrayConverter; -import com.zfoo.storage.strategy.JsonToMapConverter; -import com.zfoo.storage.strategy.StringToClassConverter; -import com.zfoo.storage.strategy.StringToDateConverter; +import com.zfoo.storage.convert.ArrayConverter; +import com.zfoo.storage.convert.JsonToMapConverter; +import com.zfoo.storage.convert.StringToClassConverter; +import com.zfoo.storage.convert.StringToDateConverter; import org.junit.Assert; import org.junit.Test; import org.springframework.context.support.ConversionServiceFactoryBean;