diff --git a/src/main/java/com/baidu/unbiz/devlib/cache/decorators/BlockingCache.java b/src/main/java/com/baidu/unbiz/devlib/cache/decorators/BlockingCache.java index 6fa3950..c6fbcb8 100644 --- a/src/main/java/com/baidu/unbiz/devlib/cache/decorators/BlockingCache.java +++ b/src/main/java/com/baidu/unbiz/devlib/cache/decorators/BlockingCache.java @@ -7,7 +7,7 @@ import java.util.concurrent.locks.ReentrantLock; import com.baidu.unbiz.devlib.cache.Cache; -import com.baidu.unbiz.devlib.exception.CacheException; +import com.baidu.unbiz.devlib.cache.exception.CacheException; /** * Simple blocking decorator diff --git a/src/main/java/com/baidu/unbiz/devlib/cache/decorators/SerializedCache.java b/src/main/java/com/baidu/unbiz/devlib/cache/decorators/SerializedCache.java index c39aa0f..adc3c5b 100644 --- a/src/main/java/com/baidu/unbiz/devlib/cache/decorators/SerializedCache.java +++ b/src/main/java/com/baidu/unbiz/devlib/cache/decorators/SerializedCache.java @@ -10,7 +10,7 @@ import java.io.Serializable; import java.util.concurrent.locks.ReadWriteLock; -import com.baidu.unbiz.devlib.exception.CacheException; +import com.baidu.unbiz.devlib.cache.exception.CacheException; import com.baidu.unbiz.devlib.cache.Cache; public class SerializedCache implements Cache { diff --git a/src/main/java/com/baidu/unbiz/devlib/exception/CacheException.java b/src/main/java/com/baidu/unbiz/devlib/cache/exception/CacheException.java similarity index 90% rename from src/main/java/com/baidu/unbiz/devlib/exception/CacheException.java rename to src/main/java/com/baidu/unbiz/devlib/cache/exception/CacheException.java index bf5bf05..d28da29 100644 --- a/src/main/java/com/baidu/unbiz/devlib/exception/CacheException.java +++ b/src/main/java/com/baidu/unbiz/devlib/cache/exception/CacheException.java @@ -1,4 +1,4 @@ -package com.baidu.unbiz.devlib.exception; +package com.baidu.unbiz.devlib.cache.exception; /** * 缓存类异常 diff --git a/src/main/java/com/baidu/unbiz/devlib/cache/impl/PerpetualCache.java b/src/main/java/com/baidu/unbiz/devlib/cache/impl/PerpetualCache.java index a9bf281..6e87a36 100644 --- a/src/main/java/com/baidu/unbiz/devlib/cache/impl/PerpetualCache.java +++ b/src/main/java/com/baidu/unbiz/devlib/cache/impl/PerpetualCache.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.concurrent.locks.ReadWriteLock; -import com.baidu.unbiz.devlib.exception.CacheException; +import com.baidu.unbiz.devlib.cache.exception.CacheException; import com.baidu.unbiz.devlib.cache.Cache; /** diff --git a/src/main/java/com/baidu/unbiz/devlib/common/GenericsAware.java b/src/main/java/com/baidu/unbiz/devlib/common/GenericsAware.java index fe4df5e..19b3150 100644 --- a/src/main/java/com/baidu/unbiz/devlib/common/GenericsAware.java +++ b/src/main/java/com/baidu/unbiz/devlib/common/GenericsAware.java @@ -4,7 +4,7 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import com.baidu.unbiz.devlib.util.ClassUtils; +import com.baidu.unbiz.devlib.utils.ClassUtils; /** diff --git a/src/main/java/com/baidu/unbiz/devlib/exception/DevLibException.java b/src/main/java/com/baidu/unbiz/devlib/common/exception/DevLibException.java similarity index 88% rename from src/main/java/com/baidu/unbiz/devlib/exception/DevLibException.java rename to src/main/java/com/baidu/unbiz/devlib/common/exception/DevLibException.java index a3df4df..ef791bb 100644 --- a/src/main/java/com/baidu/unbiz/devlib/exception/DevLibException.java +++ b/src/main/java/com/baidu/unbiz/devlib/common/exception/DevLibException.java @@ -1,4 +1,4 @@ -package com.baidu.unbiz.devlib.exception; +package com.baidu.unbiz.devlib.common.exception; public class DevLibException extends RuntimeException { diff --git a/src/main/java/com/baidu/unbiz/devlib/log/AopLogFactory.java b/src/main/java/com/baidu/unbiz/devlib/common/log/AopLogFactory.java similarity index 99% rename from src/main/java/com/baidu/unbiz/devlib/log/AopLogFactory.java rename to src/main/java/com/baidu/unbiz/devlib/common/log/AopLogFactory.java index e4ae2ac..6155a30 100644 --- a/src/main/java/com/baidu/unbiz/devlib/log/AopLogFactory.java +++ b/src/main/java/com/baidu/unbiz/devlib/common/log/AopLogFactory.java @@ -1,4 +1,4 @@ -package com.baidu.unbiz.devlib.log; +package com.baidu.unbiz.devlib.common.log; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/baidu/unbiz/devlib/log/ThreadLog.java b/src/main/java/com/baidu/unbiz/devlib/common/log/ThreadLog.java similarity index 96% rename from src/main/java/com/baidu/unbiz/devlib/log/ThreadLog.java rename to src/main/java/com/baidu/unbiz/devlib/common/log/ThreadLog.java index eb3033f..e5ca717 100644 --- a/src/main/java/com/baidu/unbiz/devlib/log/ThreadLog.java +++ b/src/main/java/com/baidu/unbiz/devlib/common/log/ThreadLog.java @@ -1,4 +1,4 @@ -package com.baidu.unbiz.devlib.log; +package com.baidu.unbiz.devlib.common.log; /** diff --git a/src/main/java/com/baidu/unbiz/devlib/log/ThreadLogContext.java b/src/main/java/com/baidu/unbiz/devlib/common/log/ThreadLogContext.java similarity index 98% rename from src/main/java/com/baidu/unbiz/devlib/log/ThreadLogContext.java rename to src/main/java/com/baidu/unbiz/devlib/common/log/ThreadLogContext.java index c05a09a..a767e85 100644 --- a/src/main/java/com/baidu/unbiz/devlib/log/ThreadLogContext.java +++ b/src/main/java/com/baidu/unbiz/devlib/common/log/ThreadLogContext.java @@ -1,4 +1,4 @@ -package com.baidu.unbiz.devlib.log; +package com.baidu.unbiz.devlib.common.log; import java.io.Serializable; import java.util.HashMap; diff --git a/src/main/java/com/baidu/unbiz/devlib/joiner/JoinerCodeGenerator.java b/src/main/java/com/baidu/unbiz/devlib/joiner/JoinerCodeGenerator.java index 9a6a3a0..3c799ab 100644 --- a/src/main/java/com/baidu/unbiz/devlib/joiner/JoinerCodeGenerator.java +++ b/src/main/java/com/baidu/unbiz/devlib/joiner/JoinerCodeGenerator.java @@ -18,11 +18,11 @@ import org.slf4j.Logger; import com.baidu.unbiz.devlib.common.MethodPair; -import com.baidu.unbiz.devlib.exception.DevLibException; -import com.baidu.unbiz.devlib.log.AopLogFactory; +import com.baidu.unbiz.devlib.common.exception.DevLibException; +import com.baidu.unbiz.devlib.common.log.AopLogFactory; import com.baidu.unbiz.devlib.cache.AtomicComputeCache; -import com.baidu.unbiz.devlib.util.ClassUtils; -import com.baidu.unbiz.devlib.util.Fs64Utils; +import com.baidu.unbiz.devlib.utils.ClassUtils; +import com.baidu.unbiz.devlib.utils.Fs64Utils; /** * 代码生成类 diff --git a/src/main/java/com/baidu/unbiz/devlib/joiner/JoinerUtils.java b/src/main/java/com/baidu/unbiz/devlib/joiner/JoinerUtils.java index 2a71a1b..f2b4c8b 100644 --- a/src/main/java/com/baidu/unbiz/devlib/joiner/JoinerUtils.java +++ b/src/main/java/com/baidu/unbiz/devlib/joiner/JoinerUtils.java @@ -11,7 +11,7 @@ import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; -import com.baidu.unbiz.devlib.log.AopLogFactory; +import com.baidu.unbiz.devlib.common.log.AopLogFactory; /** * Created by wangchongjie on 16/3/23. diff --git a/src/main/java/com/baidu/unbiz/devlib/toolbox/IdCollector.java b/src/main/java/com/baidu/unbiz/devlib/toolbox/object/IdCollector.java similarity index 98% rename from src/main/java/com/baidu/unbiz/devlib/toolbox/IdCollector.java rename to src/main/java/com/baidu/unbiz/devlib/toolbox/object/IdCollector.java index 6516411..4273be8 100644 --- a/src/main/java/com/baidu/unbiz/devlib/toolbox/IdCollector.java +++ b/src/main/java/com/baidu/unbiz/devlib/toolbox/object/IdCollector.java @@ -1,4 +1,4 @@ -package com.baidu.unbiz.devlib.toolbox; +package com.baidu.unbiz.devlib.toolbox.object; import java.lang.reflect.Field; import java.util.Collection; diff --git a/src/main/java/com/baidu/unbiz/devlib/util/ClassUtils.java b/src/main/java/com/baidu/unbiz/devlib/utils/ClassUtils.java similarity index 99% rename from src/main/java/com/baidu/unbiz/devlib/util/ClassUtils.java rename to src/main/java/com/baidu/unbiz/devlib/utils/ClassUtils.java index 3814bb1..f52396a 100644 --- a/src/main/java/com/baidu/unbiz/devlib/util/ClassUtils.java +++ b/src/main/java/com/baidu/unbiz/devlib/utils/ClassUtils.java @@ -1,4 +1,4 @@ -package com.baidu.unbiz.devlib.util; +package com.baidu.unbiz.devlib.utils; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/src/main/java/com/baidu/unbiz/devlib/util/ClassUtilsInternal.java b/src/main/java/com/baidu/unbiz/devlib/utils/ClassUtilsInternal.java similarity index 99% rename from src/main/java/com/baidu/unbiz/devlib/util/ClassUtilsInternal.java rename to src/main/java/com/baidu/unbiz/devlib/utils/ClassUtilsInternal.java index 7882c0d..92c002d 100644 --- a/src/main/java/com/baidu/unbiz/devlib/util/ClassUtilsInternal.java +++ b/src/main/java/com/baidu/unbiz/devlib/utils/ClassUtilsInternal.java @@ -1,4 +1,4 @@ -package com.baidu.unbiz.devlib.util; +package com.baidu.unbiz.devlib.utils; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/src/main/java/com/baidu/unbiz/devlib/util/Fs64Utils.java b/src/main/java/com/baidu/unbiz/devlib/utils/Fs64Utils.java similarity index 99% rename from src/main/java/com/baidu/unbiz/devlib/util/Fs64Utils.java rename to src/main/java/com/baidu/unbiz/devlib/utils/Fs64Utils.java index 20a4845..a2245af 100644 --- a/src/main/java/com/baidu/unbiz/devlib/util/Fs64Utils.java +++ b/src/main/java/com/baidu/unbiz/devlib/utils/Fs64Utils.java @@ -1,4 +1,4 @@ -package com.baidu.unbiz.devlib.util; +package com.baidu.unbiz.devlib.utils; import java.math.BigInteger; import java.util.Collection;