diff --git a/.flattened-pom.xml b/.flattened-pom.xml index 8dca9b3..1d91551 100644 --- a/.flattened-pom.xml +++ b/.flattened-pom.xml @@ -5,6 +5,7 @@ io.github.ipipman cache-man 0.0.1 + pom cache-man cache-man https://github.com/ipipman/cache-man @@ -31,25 +32,4 @@ github https://github.com/ipipman/cache-man/issues - - - org.springframework.boot - spring-boot-starter - 3.3.0 - compile - - - io.netty - netty-all - 4.1.104.Final - compile - - - org.projectlombok - lombok - 1.18.32 - compile - true - - diff --git a/cache-core/.flattened-pom.xml b/cache-core/.flattened-pom.xml new file mode 100644 index 0000000..c8f3d98 --- /dev/null +++ b/cache-core/.flattened-pom.xml @@ -0,0 +1,43 @@ + + + 4.0.0 + cn.ipman + cache-core + 0.0.1-SNAPSHOT + cache-core + cache-core + https://github.com/ipipman/cache-man/cache-core + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + ipman + ipipman@163.com + https://github.com/ipipman + + + + scm:git:https://github.com/ipipman/cache-man.git/cache-core + scm:git:https://github.com/ipipman/cache-man.git/cache-core + https://github.com/ipipman/cache-man/cache-core + + + github + https://github.com/ipipman/cache-man/issues + + + + org.projectlombok + lombok + 1.18.32 + compile + true + + + diff --git a/cache-core/pom.xml b/cache-core/pom.xml new file mode 100644 index 0000000..8d04507 --- /dev/null +++ b/cache-core/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + io.github.ipipman + cache-man + 0.0.1 + ../pom.xml + + + cn.ipman + cache-core + 0.0.1-SNAPSHOT + + cache-core + cache-core + + + + org.projectlombok + lombok + true + + + + diff --git a/src/main/java/cn/ipman/cache/command/Command.java b/cache-core/src/main/java/cn/ipman/cache/core/command/Command.java similarity index 93% rename from src/main/java/cn/ipman/cache/command/Command.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/Command.java index 9b23639..700cf63 100644 --- a/src/main/java/cn/ipman/cache/command/Command.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/Command.java @@ -1,7 +1,8 @@ -package cn.ipman.cache.command; +package cn.ipman.cache.core.command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; + +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; public interface Command { diff --git a/src/main/java/cn/ipman/cache/command/Commands.java b/cache-core/src/main/java/cn/ipman/cache/core/command/Commands.java similarity index 88% rename from src/main/java/cn/ipman/cache/command/Commands.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/Commands.java index a337d11..320a47e 100644 --- a/src/main/java/cn/ipman/cache/command/Commands.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/Commands.java @@ -1,11 +1,11 @@ -package cn.ipman.cache.command; - -import cn.ipman.cache.command.common.*; -import cn.ipman.cache.command.hash.*; -import cn.ipman.cache.command.list.*; -import cn.ipman.cache.command.set.*; -import cn.ipman.cache.command.string.*; -import cn.ipman.cache.command.zset.*; +package cn.ipman.cache.core.command; + +import cn.ipman.cache.core.command.common.*; +import cn.ipman.cache.core.command.hash.*; +import cn.ipman.cache.core.command.list.*; +import cn.ipman.cache.core.command.set.*; +import cn.ipman.cache.core.command.string.*; +import cn.ipman.cache.core.command.zset.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/cn/ipman/cache/command/common/CmdCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/common/CmdCommand.java similarity index 67% rename from src/main/java/cn/ipman/cache/command/common/CmdCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/common/CmdCommand.java index dd4ba97..bf90740 100644 --- a/src/main/java/cn/ipman/cache/command/common/CmdCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/common/CmdCommand.java @@ -1,9 +1,8 @@ -package cn.ipman.cache.command.common; - -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +package cn.ipman.cache.core.command.common; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class * diff --git a/src/main/java/cn/ipman/cache/command/common/DelCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/common/DelCommand.java similarity index 71% rename from src/main/java/cn/ipman/cache/command/common/DelCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/common/DelCommand.java index 89c1c07..1221afb 100644 --- a/src/main/java/cn/ipman/cache/command/common/DelCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/common/DelCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.common; +package cn.ipman.cache.core.command.common; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/common/ExistsCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/common/ExistsCommand.java similarity index 71% rename from src/main/java/cn/ipman/cache/command/common/ExistsCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/common/ExistsCommand.java index 793dc5a..a46d39a 100644 --- a/src/main/java/cn/ipman/cache/command/common/ExistsCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/common/ExistsCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.common; +package cn.ipman.cache.core.command.common; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/common/ExpireCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/common/ExpireCommand.java similarity index 73% rename from src/main/java/cn/ipman/cache/command/common/ExpireCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/common/ExpireCommand.java index 2c43257..b2c6f54 100644 --- a/src/main/java/cn/ipman/cache/command/common/ExpireCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/common/ExpireCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.common; +package cn.ipman.cache.core.command.common; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/common/InfoCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/common/InfoCommand.java similarity index 74% rename from src/main/java/cn/ipman/cache/command/common/InfoCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/common/InfoCommand.java index ac3504f..193e94c 100644 --- a/src/main/java/cn/ipman/cache/command/common/InfoCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/common/InfoCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.common; +package cn.ipman.cache.core.command.common; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/common/PingCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/common/PingCommand.java similarity index 72% rename from src/main/java/cn/ipman/cache/command/common/PingCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/common/PingCommand.java index 1cf7e94..233727a 100644 --- a/src/main/java/cn/ipman/cache/command/common/PingCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/common/PingCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.common; +package cn.ipman.cache.core.command.common; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/common/TTLCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/common/TTLCommand.java similarity index 70% rename from src/main/java/cn/ipman/cache/command/common/TTLCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/common/TTLCommand.java index 65e9591..e9daaa4 100644 --- a/src/main/java/cn/ipman/cache/command/common/TTLCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/common/TTLCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.common; +package cn.ipman.cache.core.command.common; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/hash/HdelCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/hash/HdelCommand.java similarity index 73% rename from src/main/java/cn/ipman/cache/command/hash/HdelCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/hash/HdelCommand.java index 734be7c..8089c76 100644 --- a/src/main/java/cn/ipman/cache/command/hash/HdelCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/hash/HdelCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.hash; +package cn.ipman.cache.core.command.hash; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/hash/HexistsCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/hash/HexistsCommand.java similarity index 73% rename from src/main/java/cn/ipman/cache/command/hash/HexistsCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/hash/HexistsCommand.java index 29eeba4..40ee823 100644 --- a/src/main/java/cn/ipman/cache/command/hash/HexistsCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/hash/HexistsCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.hash; +package cn.ipman.cache.core.command.hash; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/hash/HgetCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/hash/HgetCommand.java similarity index 73% rename from src/main/java/cn/ipman/cache/command/hash/HgetCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/hash/HgetCommand.java index a6e75ca..00dcc4e 100644 --- a/src/main/java/cn/ipman/cache/command/hash/HgetCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/hash/HgetCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.hash; +package cn.ipman.cache.core.command.hash; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/hash/HgetallCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/hash/HgetallCommand.java similarity index 71% rename from src/main/java/cn/ipman/cache/command/hash/HgetallCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/hash/HgetallCommand.java index 200615f..5a09160 100644 --- a/src/main/java/cn/ipman/cache/command/hash/HgetallCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/hash/HgetallCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.hash; +package cn.ipman.cache.core.command.hash; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/hash/HlenCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/hash/HlenCommand.java similarity index 71% rename from src/main/java/cn/ipman/cache/command/hash/HlenCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/hash/HlenCommand.java index 9db69d8..da697ea 100644 --- a/src/main/java/cn/ipman/cache/command/hash/HlenCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/hash/HlenCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.hash; +package cn.ipman.cache.core.command.hash; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/hash/HmgetCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/hash/HmgetCommand.java similarity index 77% rename from src/main/java/cn/ipman/cache/command/hash/HmgetCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/hash/HmgetCommand.java index f1dc825..998efed 100644 --- a/src/main/java/cn/ipman/cache/command/hash/HmgetCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/hash/HmgetCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.hash; +package cn.ipman.cache.core.command.hash; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/hash/HsetCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/hash/HsetCommand.java similarity index 76% rename from src/main/java/cn/ipman/cache/command/hash/HsetCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/hash/HsetCommand.java index 055b767..04b4a5e 100644 --- a/src/main/java/cn/ipman/cache/command/hash/HsetCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/hash/HsetCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.hash; +package cn.ipman.cache.core.command.hash; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/list/LindexCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/list/LindexCommand.java similarity index 74% rename from src/main/java/cn/ipman/cache/command/list/LindexCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/list/LindexCommand.java index f4589d0..bcbc9b4 100644 --- a/src/main/java/cn/ipman/cache/command/list/LindexCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/list/LindexCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.list; +package cn.ipman.cache.core.command.list; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/list/LlenCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/list/LlenCommand.java similarity index 70% rename from src/main/java/cn/ipman/cache/command/list/LlenCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/list/LlenCommand.java index a375b19..505c54c 100644 --- a/src/main/java/cn/ipman/cache/command/list/LlenCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/list/LlenCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.list; +package cn.ipman.cache.core.command.list; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/list/LpopCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/list/LpopCommand.java similarity index 80% rename from src/main/java/cn/ipman/cache/command/list/LpopCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/list/LpopCommand.java index 16c55ef..1d45a64 100644 --- a/src/main/java/cn/ipman/cache/command/list/LpopCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/list/LpopCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.list; +package cn.ipman.cache.core.command.list; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/list/LpushCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/list/LpushCommand.java similarity index 73% rename from src/main/java/cn/ipman/cache/command/list/LpushCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/list/LpushCommand.java index c372945..43b000e 100644 --- a/src/main/java/cn/ipman/cache/command/list/LpushCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/list/LpushCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.list; +package cn.ipman.cache.core.command.list; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/list/LrangeCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/list/LrangeCommand.java similarity index 77% rename from src/main/java/cn/ipman/cache/command/list/LrangeCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/list/LrangeCommand.java index 84f0543..86b00b5 100644 --- a/src/main/java/cn/ipman/cache/command/list/LrangeCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/list/LrangeCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.list; +package cn.ipman.cache.core.command.list; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/list/RpopCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/list/RpopCommand.java similarity index 80% rename from src/main/java/cn/ipman/cache/command/list/RpopCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/list/RpopCommand.java index 2b5c45e..b56332b 100644 --- a/src/main/java/cn/ipman/cache/command/list/RpopCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/list/RpopCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.list; +package cn.ipman.cache.core.command.list; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/list/RpushCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/list/RpushCommand.java similarity index 73% rename from src/main/java/cn/ipman/cache/command/list/RpushCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/list/RpushCommand.java index 01d0861..465acb4 100644 --- a/src/main/java/cn/ipman/cache/command/list/RpushCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/list/RpushCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.list; +package cn.ipman.cache.core.command.list; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/set/SaddCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/set/SaddCommand.java similarity index 73% rename from src/main/java/cn/ipman/cache/command/set/SaddCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/set/SaddCommand.java index 8827cdd..c541e2f 100644 --- a/src/main/java/cn/ipman/cache/command/set/SaddCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/set/SaddCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.set; +package cn.ipman.cache.core.command.set; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/set/ScardCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/set/ScardCommand.java similarity index 71% rename from src/main/java/cn/ipman/cache/command/set/ScardCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/set/ScardCommand.java index 1e021ab..a505a5d 100644 --- a/src/main/java/cn/ipman/cache/command/set/ScardCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/set/ScardCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.set; +package cn.ipman.cache.core.command.set; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/set/SismemberCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/set/SismemberCommand.java similarity index 74% rename from src/main/java/cn/ipman/cache/command/set/SismemberCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/set/SismemberCommand.java index 6f6f0ea..0269e2c 100644 --- a/src/main/java/cn/ipman/cache/command/set/SismemberCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/set/SismemberCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.set; +package cn.ipman.cache.core.command.set; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/set/SmembersCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/set/SmembersCommand.java similarity index 71% rename from src/main/java/cn/ipman/cache/command/set/SmembersCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/set/SmembersCommand.java index 376f6b9..0c46239 100644 --- a/src/main/java/cn/ipman/cache/command/set/SmembersCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/set/SmembersCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.set; +package cn.ipman.cache.core.command.set; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/set/SpopCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/set/SpopCommand.java similarity index 80% rename from src/main/java/cn/ipman/cache/command/set/SpopCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/set/SpopCommand.java index 8ec33e9..40d1784 100644 --- a/src/main/java/cn/ipman/cache/command/set/SpopCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/set/SpopCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.set; +package cn.ipman.cache.core.command.set; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/set/SremCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/set/SremCommand.java similarity index 73% rename from src/main/java/cn/ipman/cache/command/set/SremCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/set/SremCommand.java index 877b596..908a652 100644 --- a/src/main/java/cn/ipman/cache/command/set/SremCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/set/SremCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.set; +package cn.ipman.cache.core.command.set; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/string/DecrCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/string/DecrCommand.java similarity index 76% rename from src/main/java/cn/ipman/cache/command/string/DecrCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/string/DecrCommand.java index b962507..ce950d7 100644 --- a/src/main/java/cn/ipman/cache/command/string/DecrCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/string/DecrCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.string; +package cn.ipman.cache.core.command.string; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/string/GetCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/string/GetCommand.java similarity index 70% rename from src/main/java/cn/ipman/cache/command/string/GetCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/string/GetCommand.java index b784afe..60d18d0 100644 --- a/src/main/java/cn/ipman/cache/command/string/GetCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/string/GetCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.string; +package cn.ipman.cache.core.command.string; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/string/IncrCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/string/IncrCommand.java similarity index 76% rename from src/main/java/cn/ipman/cache/command/string/IncrCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/string/IncrCommand.java index 7c57abe..479d45b 100644 --- a/src/main/java/cn/ipman/cache/command/string/IncrCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/string/IncrCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.string; +package cn.ipman.cache.core.command.string; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/string/MgetCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/string/MgetCommand.java similarity index 71% rename from src/main/java/cn/ipman/cache/command/string/MgetCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/string/MgetCommand.java index 042065c..c38c239 100644 --- a/src/main/java/cn/ipman/cache/command/string/MgetCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/string/MgetCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.string; +package cn.ipman.cache.core.command.string; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/string/MsetCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/string/MsetCommand.java similarity index 74% rename from src/main/java/cn/ipman/cache/command/string/MsetCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/string/MsetCommand.java index 65c711a..d61bc64 100644 --- a/src/main/java/cn/ipman/cache/command/string/MsetCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/string/MsetCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.string; +package cn.ipman.cache.core.command.string; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/string/SetCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/string/SetCommand.java similarity index 72% rename from src/main/java/cn/ipman/cache/command/string/SetCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/string/SetCommand.java index 4e24c81..1bfb321 100644 --- a/src/main/java/cn/ipman/cache/command/string/SetCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/string/SetCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.string; +package cn.ipman.cache.core.command.string; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/string/StrlenCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/string/StrlenCommand.java similarity index 70% rename from src/main/java/cn/ipman/cache/command/string/StrlenCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/string/StrlenCommand.java index fb6a04c..64434be 100644 --- a/src/main/java/cn/ipman/cache/command/string/StrlenCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/string/StrlenCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.string; +package cn.ipman.cache.core.command.string; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/zset/ZaddCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZaddCommand.java similarity index 80% rename from src/main/java/cn/ipman/cache/command/zset/ZaddCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZaddCommand.java index 6ddbcc1..d4074e5 100644 --- a/src/main/java/cn/ipman/cache/command/zset/ZaddCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZaddCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.zset; +package cn.ipman.cache.core.command.zset; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; import java.util.Arrays; diff --git a/src/main/java/cn/ipman/cache/command/zset/ZcardCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZcardCommand.java similarity index 71% rename from src/main/java/cn/ipman/cache/command/zset/ZcardCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZcardCommand.java index fbe8d67..e5c7f61 100644 --- a/src/main/java/cn/ipman/cache/command/zset/ZcardCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZcardCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.zset; +package cn.ipman.cache.core.command.zset; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/zset/ZcountCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZcountCommand.java similarity index 76% rename from src/main/java/cn/ipman/cache/command/zset/ZcountCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZcountCommand.java index 6276792..0547a9d 100644 --- a/src/main/java/cn/ipman/cache/command/zset/ZcountCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZcountCommand.java @@ -1,9 +1,8 @@ -package cn.ipman.cache.command.zset; - -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +package cn.ipman.cache.core.command.zset; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class * diff --git a/src/main/java/cn/ipman/cache/command/zset/ZrankCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZrankCommand.java similarity index 73% rename from src/main/java/cn/ipman/cache/command/zset/ZrankCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZrankCommand.java index 9e22e4b..376bfd2 100644 --- a/src/main/java/cn/ipman/cache/command/zset/ZrankCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZrankCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.zset; +package cn.ipman.cache.core.command.zset; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/zset/ZremCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZremCommand.java similarity index 73% rename from src/main/java/cn/ipman/cache/command/zset/ZremCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZremCommand.java index ccfb5d8..732c702 100644 --- a/src/main/java/cn/ipman/cache/command/zset/ZremCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZremCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.zset; +package cn.ipman.cache.core.command.zset; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/command/zset/ZscoreCommand.java b/cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZscoreCommand.java similarity index 75% rename from src/main/java/cn/ipman/cache/command/zset/ZscoreCommand.java rename to cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZscoreCommand.java index 04bd109..bb80c62 100644 --- a/src/main/java/cn/ipman/cache/command/zset/ZscoreCommand.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/command/zset/ZscoreCommand.java @@ -1,8 +1,8 @@ -package cn.ipman.cache.command.zset; +package cn.ipman.cache.core.command.zset; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; /** * Description for this class diff --git a/src/main/java/cn/ipman/cache/core/AbstractOperator.java b/cache-core/src/main/java/cn/ipman/cache/core/core/AbstractOperator.java similarity index 98% rename from src/main/java/cn/ipman/cache/core/AbstractOperator.java rename to cache-core/src/main/java/cn/ipman/cache/core/core/AbstractOperator.java index f491cf1..ffcbb8a 100644 --- a/src/main/java/cn/ipman/cache/core/AbstractOperator.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/core/AbstractOperator.java @@ -1,4 +1,4 @@ -package cn.ipman.cache.core; +package cn.ipman.cache.core.core; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/cn/ipman/cache/core/IMCache.java b/cache-core/src/main/java/cn/ipman/cache/core/core/IMCache.java similarity index 98% rename from src/main/java/cn/ipman/cache/core/IMCache.java rename to cache-core/src/main/java/cn/ipman/cache/core/core/IMCache.java index 6aec46c..0dd030d 100644 --- a/src/main/java/cn/ipman/cache/core/IMCache.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/core/IMCache.java @@ -1,6 +1,6 @@ -package cn.ipman.cache.core; +package cn.ipman.cache.core.core; -import cn.ipman.cache.core.operator.*; +import cn.ipman.cache.core.core.operator.*; /** * cache entries. diff --git a/src/main/java/cn/ipman/cache/core/Reply.java b/cache-core/src/main/java/cn/ipman/cache/core/core/Reply.java similarity index 96% rename from src/main/java/cn/ipman/cache/core/Reply.java rename to cache-core/src/main/java/cn/ipman/cache/core/core/Reply.java index 199cac0..9919330 100644 --- a/src/main/java/cn/ipman/cache/core/Reply.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/core/Reply.java @@ -1,4 +1,4 @@ -package cn.ipman.cache.core; +package cn.ipman.cache.core.core; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/cn/ipman/cache/core/ReplyType.java b/cache-core/src/main/java/cn/ipman/cache/core/core/ReplyType.java similarity index 81% rename from src/main/java/cn/ipman/cache/core/ReplyType.java rename to cache-core/src/main/java/cn/ipman/cache/core/core/ReplyType.java index 2a2aac5..e8b3a99 100644 --- a/src/main/java/cn/ipman/cache/core/ReplyType.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/core/ReplyType.java @@ -1,4 +1,4 @@ -package cn.ipman.cache.core; +package cn.ipman.cache.core.core; /** * enum reply type. diff --git a/src/main/java/cn/ipman/cache/core/operator/CommonOperator.java b/cache-core/src/main/java/cn/ipman/cache/core/core/operator/CommonOperator.java similarity index 89% rename from src/main/java/cn/ipman/cache/core/operator/CommonOperator.java rename to cache-core/src/main/java/cn/ipman/cache/core/core/operator/CommonOperator.java index f9ce298..5c1f647 100644 --- a/src/main/java/cn/ipman/cache/core/operator/CommonOperator.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/core/operator/CommonOperator.java @@ -1,7 +1,7 @@ -package cn.ipman.cache.core.operator; +package cn.ipman.cache.core.core.operator; -import cn.ipman.cache.core.AbstractOperator; -import org.springframework.boot.autoconfigure.jms.JmsProperties; + +import cn.ipman.cache.core.core.AbstractOperator; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/cn/ipman/cache/core/operator/HashOperator.java b/cache-core/src/main/java/cn/ipman/cache/core/core/operator/HashOperator.java similarity index 97% rename from src/main/java/cn/ipman/cache/core/operator/HashOperator.java rename to cache-core/src/main/java/cn/ipman/cache/core/core/operator/HashOperator.java index 10975db..74b7e34 100644 --- a/src/main/java/cn/ipman/cache/core/operator/HashOperator.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/core/operator/HashOperator.java @@ -1,6 +1,7 @@ -package cn.ipman.cache.core.operator; +package cn.ipman.cache.core.core.operator; -import cn.ipman.cache.core.AbstractOperator; + +import cn.ipman.cache.core.core.AbstractOperator; import java.util.Arrays; import java.util.LinkedHashMap; diff --git a/src/main/java/cn/ipman/cache/core/operator/ListOperator.java b/cache-core/src/main/java/cn/ipman/cache/core/core/operator/ListOperator.java similarity index 97% rename from src/main/java/cn/ipman/cache/core/operator/ListOperator.java rename to cache-core/src/main/java/cn/ipman/cache/core/core/operator/ListOperator.java index a594b95..01190df 100644 --- a/src/main/java/cn/ipman/cache/core/operator/ListOperator.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/core/operator/ListOperator.java @@ -1,6 +1,7 @@ -package cn.ipman.cache.core.operator; +package cn.ipman.cache.core.core.operator; -import cn.ipman.cache.core.AbstractOperator; + +import cn.ipman.cache.core.core.AbstractOperator; import java.util.Arrays; import java.util.LinkedList; diff --git a/src/main/java/cn/ipman/cache/core/operator/SetOperator.java b/cache-core/src/main/java/cn/ipman/cache/core/core/operator/SetOperator.java similarity index 97% rename from src/main/java/cn/ipman/cache/core/operator/SetOperator.java rename to cache-core/src/main/java/cn/ipman/cache/core/core/operator/SetOperator.java index 0869090..79d406e 100644 --- a/src/main/java/cn/ipman/cache/core/operator/SetOperator.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/core/operator/SetOperator.java @@ -1,6 +1,7 @@ -package cn.ipman.cache.core.operator; +package cn.ipman.cache.core.core.operator; -import cn.ipman.cache.core.AbstractOperator; + +import cn.ipman.cache.core.core.AbstractOperator; import java.util.Arrays; import java.util.LinkedHashSet; diff --git a/src/main/java/cn/ipman/cache/core/operator/StringOperator.java b/cache-core/src/main/java/cn/ipman/cache/core/core/operator/StringOperator.java similarity index 95% rename from src/main/java/cn/ipman/cache/core/operator/StringOperator.java rename to cache-core/src/main/java/cn/ipman/cache/core/core/operator/StringOperator.java index f936eae..89ccd45 100644 --- a/src/main/java/cn/ipman/cache/core/operator/StringOperator.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/core/operator/StringOperator.java @@ -1,6 +1,7 @@ -package cn.ipman.cache.core.operator; +package cn.ipman.cache.core.core.operator; -import cn.ipman.cache.core.AbstractOperator; + +import cn.ipman.cache.core.core.AbstractOperator; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/cn/ipman/cache/core/operator/ZSetOperator.java b/cache-core/src/main/java/cn/ipman/cache/core/core/operator/ZSetOperator.java similarity index 97% rename from src/main/java/cn/ipman/cache/core/operator/ZSetOperator.java rename to cache-core/src/main/java/cn/ipman/cache/core/core/operator/ZSetOperator.java index ed6c5ad..76056ec 100644 --- a/src/main/java/cn/ipman/cache/core/operator/ZSetOperator.java +++ b/cache-core/src/main/java/cn/ipman/cache/core/core/operator/ZSetOperator.java @@ -1,6 +1,7 @@ -package cn.ipman.cache.core.operator; +package cn.ipman.cache.core.core.operator; -import cn.ipman.cache.core.AbstractOperator; + +import cn.ipman.cache.core.core.AbstractOperator; import java.util.Arrays; import java.util.LinkedHashSet; diff --git a/cache-core/src/main/resources/application.properties b/cache-core/src/main/resources/application.properties new file mode 100644 index 0000000..3193916 --- /dev/null +++ b/cache-core/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=cache-core diff --git a/cache-server/.flattened-pom.xml b/cache-server/.flattened-pom.xml new file mode 100644 index 0000000..7e77150 --- /dev/null +++ b/cache-server/.flattened-pom.xml @@ -0,0 +1,61 @@ + + + 4.0.0 + cn.ipman + cache-server + 0.0.1-SNAPSHOT + cache-server + cache-server + https://github.com/ipipman/cache-man/cache-server + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + ipman + ipipman@163.com + https://github.com/ipipman + + + + scm:git:https://github.com/ipipman/cache-man.git/cache-server + scm:git:https://github.com/ipipman/cache-man.git/cache-server + https://github.com/ipipman/cache-man/cache-server + + + github + https://github.com/ipipman/cache-man/issues + + + + org.springframework.boot + spring-boot-starter + 3.3.0 + compile + + + cn.ipman + cache-core + 0.0.1-SNAPSHOT + compile + + + io.netty + netty-all + 4.1.104.Final + compile + + + org.projectlombok + lombok + 1.18.32 + compile + true + + + diff --git a/cache-server/pom.xml b/cache-server/pom.xml new file mode 100644 index 0000000..734ecf2 --- /dev/null +++ b/cache-server/pom.xml @@ -0,0 +1,128 @@ + + + 4.0.0 + + + io.github.ipipman + cache-man + 0.0.1 + ../pom.xml + + + cn.ipman + cache-server + 0.0.1-SNAPSHOT + cache-server + cache-server + + + + org.springframework.boot + spring-boot-starter + + + + cn.ipman + cache-core + 0.0.1-SNAPSHOT + + + + io.netty + netty-all + 4.1.104.Final + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + junit + junit + 4.13.2 + test + + + + org.jacoco + org.jacoco.agent + 0.8.7 + test + + + + org.luaj + luaj-jse + 3.0.1 + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + repackage + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.2.3 + + + org.apache.maven.surefire + surefire-junit-platform + 3.2.3 + + + + + + org.jacoco + jacoco-maven-plugin + 0.8.7 + + + + prepare-agent + + + + report + test + + report + + + + + + + + diff --git a/src/main/java/cn/ipman/cache/CacheManApplication.java b/cache-server/src/main/java/cn/ipman/cache/server/CacheServerApplication.java similarity index 66% rename from src/main/java/cn/ipman/cache/CacheManApplication.java rename to cache-server/src/main/java/cn/ipman/cache/server/CacheServerApplication.java index 4deebcd..3813011 100644 --- a/src/main/java/cn/ipman/cache/CacheManApplication.java +++ b/cache-server/src/main/java/cn/ipman/cache/server/CacheServerApplication.java @@ -1,4 +1,4 @@ -package cn.ipman.cache; +package cn.ipman.cache.server; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -6,10 +6,10 @@ @SpringBootApplication @EnableAsync -public class CacheManApplication { +public class CacheServerApplication { public static void main(String[] args) { - SpringApplication.run(CacheManApplication.class, args); + SpringApplication.run(CacheServerApplication.class, args); } } diff --git a/src/main/java/cn/ipman/cache/config/IMApplicationListener.java b/cache-server/src/main/java/cn/ipman/cache/server/config/IMApplicationListener.java similarity index 95% rename from src/main/java/cn/ipman/cache/config/IMApplicationListener.java rename to cache-server/src/main/java/cn/ipman/cache/server/config/IMApplicationListener.java index 2f32a4a..f443323 100644 --- a/src/main/java/cn/ipman/cache/config/IMApplicationListener.java +++ b/cache-server/src/main/java/cn/ipman/cache/server/config/IMApplicationListener.java @@ -1,6 +1,6 @@ -package cn.ipman.cache.config; +package cn.ipman.cache.server.config; -import cn.ipman.cache.server.IMServerPlugin; +import cn.ipman.cache.server.server.IMServerPlugin; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.event.ApplicationReadyEvent; @@ -58,7 +58,5 @@ public void onApplicationEvent(@NonNull ApplicationEvent event) { } - - } } diff --git a/src/main/java/cn/ipman/cache/server/IMCacheDecoder.java b/cache-server/src/main/java/cn/ipman/cache/server/server/IMCacheDecoder.java similarity index 98% rename from src/main/java/cn/ipman/cache/server/IMCacheDecoder.java rename to cache-server/src/main/java/cn/ipman/cache/server/server/IMCacheDecoder.java index 235b54f..a90bc32 100644 --- a/src/main/java/cn/ipman/cache/server/IMCacheDecoder.java +++ b/cache-server/src/main/java/cn/ipman/cache/server/server/IMCacheDecoder.java @@ -1,4 +1,4 @@ -package cn.ipman.cache.server; +package cn.ipman.cache.server.server; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/cn/ipman/cache/server/IMCacheHandler.java b/cache-server/src/main/java/cn/ipman/cache/server/server/IMCacheHandler.java similarity index 97% rename from src/main/java/cn/ipman/cache/server/IMCacheHandler.java rename to cache-server/src/main/java/cn/ipman/cache/server/server/IMCacheHandler.java index 303254e..23764bd 100644 --- a/src/main/java/cn/ipman/cache/server/IMCacheHandler.java +++ b/cache-server/src/main/java/cn/ipman/cache/server/server/IMCacheHandler.java @@ -1,9 +1,10 @@ -package cn.ipman.cache.server; +package cn.ipman.cache.server.server; -import cn.ipman.cache.command.Command; -import cn.ipman.cache.command.Commands; -import cn.ipman.cache.core.IMCache; -import cn.ipman.cache.core.Reply; + +import cn.ipman.cache.core.command.Command; +import cn.ipman.cache.core.command.Commands; +import cn.ipman.cache.core.core.IMCache; +import cn.ipman.cache.core.core.Reply; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/cn/ipman/cache/server/IMCacheServer.java b/cache-server/src/main/java/cn/ipman/cache/server/server/IMCacheServer.java similarity index 94% rename from src/main/java/cn/ipman/cache/server/IMCacheServer.java rename to cache-server/src/main/java/cn/ipman/cache/server/server/IMCacheServer.java index ab71a0a..01cd8e0 100644 --- a/src/main/java/cn/ipman/cache/server/IMCacheServer.java +++ b/cache-server/src/main/java/cn/ipman/cache/server/server/IMCacheServer.java @@ -1,8 +1,11 @@ -package cn.ipman.cache.server; +package cn.ipman.cache.server.server; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.PooledByteBufAllocator; -import io.netty.channel.*; +import io.netty.channel.Channel; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; +import io.netty.channel.EventLoopGroup; import io.netty.channel.epoll.EpollChannelOption; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.SocketChannel; diff --git a/src/main/java/cn/ipman/cache/server/IMServerPlugin.java b/cache-server/src/main/java/cn/ipman/cache/server/server/IMServerPlugin.java similarity index 71% rename from src/main/java/cn/ipman/cache/server/IMServerPlugin.java rename to cache-server/src/main/java/cn/ipman/cache/server/server/IMServerPlugin.java index 50dbca0..027bdd4 100644 --- a/src/main/java/cn/ipman/cache/server/IMServerPlugin.java +++ b/cache-server/src/main/java/cn/ipman/cache/server/server/IMServerPlugin.java @@ -1,4 +1,4 @@ -package cn.ipman.cache.server; +package cn.ipman.cache.server.server; public interface IMServerPlugin { diff --git a/cache-server/src/main/resources/application.properties b/cache-server/src/main/resources/application.properties new file mode 100644 index 0000000..36f49a7 --- /dev/null +++ b/cache-server/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=cache-server diff --git a/src/main/resources/lua/tag_del.lua b/cache-server/src/main/resources/lua/tag_del.lua similarity index 100% rename from src/main/resources/lua/tag_del.lua rename to cache-server/src/main/resources/lua/tag_del.lua diff --git a/src/main/resources/lua/tag_get.lua b/cache-server/src/main/resources/lua/tag_get.lua similarity index 100% rename from src/main/resources/lua/tag_get.lua rename to cache-server/src/main/resources/lua/tag_get.lua diff --git a/src/main/resources/lua/tag_set.lua b/cache-server/src/main/resources/lua/tag_set.lua similarity index 100% rename from src/main/resources/lua/tag_set.lua rename to cache-server/src/main/resources/lua/tag_set.lua diff --git a/src/test/java/cn/ipman/cache/CacheManApplicationTests.java b/cache-server/src/test/java/cn/ipman/cache/server/CacheServerApplicationTests.java similarity index 71% rename from src/test/java/cn/ipman/cache/CacheManApplicationTests.java rename to cache-server/src/test/java/cn/ipman/cache/server/CacheServerApplicationTests.java index 2534055..c9bb075 100644 --- a/src/test/java/cn/ipman/cache/CacheManApplicationTests.java +++ b/cache-server/src/test/java/cn/ipman/cache/server/CacheServerApplicationTests.java @@ -1,10 +1,10 @@ -package cn.ipman.cache; +package cn.ipman.cache.server; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; //@SpringBootTest -//class CacheManApplicationTests { +//class CacheServerApplicationTests { // // @Test // void contextLoads() { diff --git a/src/test/java/cn/ipman/cache/lua/LuaTest.java b/cache-server/src/test/java/cn/ipman/cache/server/lua/LuaTest.java similarity index 99% rename from src/test/java/cn/ipman/cache/lua/LuaTest.java rename to cache-server/src/test/java/cn/ipman/cache/server/lua/LuaTest.java index e5d24c5..b4294c2 100644 --- a/src/test/java/cn/ipman/cache/lua/LuaTest.java +++ b/cache-server/src/test/java/cn/ipman/cache/server/lua/LuaTest.java @@ -1,4 +1,4 @@ -package cn.ipman.cache.lua; +package cn.ipman.cache.server.lua; import org.junit.Test; import org.luaj.vm2.Globals; diff --git a/src/test/java/cn/ipman/cache/lua/RedisLib.java b/cache-server/src/test/java/cn/ipman/cache/server/lua/RedisLib.java similarity index 97% rename from src/test/java/cn/ipman/cache/lua/RedisLib.java rename to cache-server/src/test/java/cn/ipman/cache/server/lua/RedisLib.java index 4c68fc9..7ce602a 100644 --- a/src/test/java/cn/ipman/cache/lua/RedisLib.java +++ b/cache-server/src/test/java/cn/ipman/cache/server/lua/RedisLib.java @@ -1,6 +1,6 @@ -package cn.ipman.cache.lua; +package cn.ipman.cache.server.lua; -import cn.ipman.cache.core.IMCache; +import cn.ipman.cache.core.core.IMCache; import org.apache.logging.log4j.util.Strings; import org.luaj.vm2.Globals; import org.luaj.vm2.LuaTable; diff --git a/src/test/java/cn/ipman/cache/operator/CommonOperatorTest.java b/cache-server/src/test/java/cn/ipman/cache/server/operator/CommonOperatorTest.java similarity index 92% rename from src/test/java/cn/ipman/cache/operator/CommonOperatorTest.java rename to cache-server/src/test/java/cn/ipman/cache/server/operator/CommonOperatorTest.java index 3c403a4..612970d 100644 --- a/src/test/java/cn/ipman/cache/operator/CommonOperatorTest.java +++ b/cache-server/src/test/java/cn/ipman/cache/server/operator/CommonOperatorTest.java @@ -1,9 +1,11 @@ -package cn.ipman.cache.operator; -import cn.ipman.cache.core.AbstractOperator; -import cn.ipman.cache.core.operator.CommonOperator; +package cn.ipman.cache.server.operator; + +import cn.ipman.cache.core.core.AbstractOperator; +import cn.ipman.cache.core.core.operator.CommonOperator; import org.junit.Before; import org.junit.Test; -import static junit.framework.TestCase.assertEquals; + +import static org.junit.Assert.assertEquals; /** * Description for this class diff --git a/src/test/java/cn/ipman/cache/operator/HashOperatorTest.java b/cache-server/src/test/java/cn/ipman/cache/server/operator/HashOperatorTest.java similarity index 97% rename from src/test/java/cn/ipman/cache/operator/HashOperatorTest.java rename to cache-server/src/test/java/cn/ipman/cache/server/operator/HashOperatorTest.java index de7033a..3372057 100644 --- a/src/test/java/cn/ipman/cache/operator/HashOperatorTest.java +++ b/cache-server/src/test/java/cn/ipman/cache/server/operator/HashOperatorTest.java @@ -1,9 +1,11 @@ -package cn.ipman.cache.operator; +package cn.ipman.cache.server.operator; -import cn.ipman.cache.core.operator.HashOperator; +import cn.ipman.cache.core.core.operator.HashOperator; import org.junit.Before; import org.junit.Test; + import java.util.Arrays; + import static junit.framework.TestCase.*; diff --git a/src/test/java/cn/ipman/cache/operator/ListOperatorTest.java b/cache-server/src/test/java/cn/ipman/cache/server/operator/ListOperatorTest.java similarity index 91% rename from src/test/java/cn/ipman/cache/operator/ListOperatorTest.java rename to cache-server/src/test/java/cn/ipman/cache/server/operator/ListOperatorTest.java index 3a300db..2ec6bf2 100644 --- a/src/test/java/cn/ipman/cache/operator/ListOperatorTest.java +++ b/cache-server/src/test/java/cn/ipman/cache/server/operator/ListOperatorTest.java @@ -1,9 +1,12 @@ -package cn.ipman.cache.operator; -import cn.ipman.cache.core.operator.CommonOperator; -import cn.ipman.cache.core.operator.ListOperator; +package cn.ipman.cache.server.operator; + +import cn.ipman.cache.core.core.operator.CommonOperator; +import cn.ipman.cache.core.core.operator.ListOperator; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * Description for this class diff --git a/src/test/java/cn/ipman/cache/operator/SetOperatorTest.java b/cache-server/src/test/java/cn/ipman/cache/server/operator/SetOperatorTest.java similarity index 97% rename from src/test/java/cn/ipman/cache/operator/SetOperatorTest.java rename to cache-server/src/test/java/cn/ipman/cache/server/operator/SetOperatorTest.java index dc33316..e9565a5 100644 --- a/src/test/java/cn/ipman/cache/operator/SetOperatorTest.java +++ b/cache-server/src/test/java/cn/ipman/cache/server/operator/SetOperatorTest.java @@ -1,11 +1,9 @@ -package cn.ipman.cache.operator; +package cn.ipman.cache.server.operator; -import cn.ipman.cache.core.operator.SetOperator; +import cn.ipman.cache.core.core.operator.SetOperator; import org.junit.Before; import org.junit.Test; -import java.util.Optional; - import static org.junit.Assert.*; /** diff --git a/src/test/java/cn/ipman/cache/operator/StringOperatorTest.java b/cache-server/src/test/java/cn/ipman/cache/server/operator/StringOperatorTest.java similarity index 91% rename from src/test/java/cn/ipman/cache/operator/StringOperatorTest.java rename to cache-server/src/test/java/cn/ipman/cache/server/operator/StringOperatorTest.java index 743141e..7c8b9d6 100644 --- a/src/test/java/cn/ipman/cache/operator/StringOperatorTest.java +++ b/cache-server/src/test/java/cn/ipman/cache/server/operator/StringOperatorTest.java @@ -1,8 +1,11 @@ -package cn.ipman.cache.operator; -import cn.ipman.cache.core.operator.StringOperator; +package cn.ipman.cache.server.operator; + +import cn.ipman.cache.core.core.operator.StringOperator; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; /** * Description for this class diff --git a/src/test/java/cn/ipman/cache/operator/ZSetOperatorTest.java b/cache-server/src/test/java/cn/ipman/cache/server/operator/ZSetOperatorTest.java similarity index 93% rename from src/test/java/cn/ipman/cache/operator/ZSetOperatorTest.java rename to cache-server/src/test/java/cn/ipman/cache/server/operator/ZSetOperatorTest.java index 7cf8abe..325028d 100644 --- a/src/test/java/cn/ipman/cache/operator/ZSetOperatorTest.java +++ b/cache-server/src/test/java/cn/ipman/cache/server/operator/ZSetOperatorTest.java @@ -1,10 +1,11 @@ -package cn.ipman.cache.operator; +package cn.ipman.cache.server.operator; -import cn.ipman.cache.core.operator.ZSetOperator; +import cn.ipman.cache.core.core.operator.ZSetOperator; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; /** * Description for this class diff --git a/pom.xml b/pom.xml index e3f278d..50c1d40 100644 --- a/pom.xml +++ b/pom.xml @@ -15,12 +15,18 @@ cache-man cache-man - jar + pom 17 + + + cache-core + cache-server + + https://github.com/ipipman/cache-man @@ -50,51 +56,6 @@ - - - org.springframework.boot - spring-boot-starter - - - - io.netty - netty-all - 4.1.104.Final - - - - org.projectlombok - lombok - true - - - - org.springframework.boot - spring-boot-starter-test - test - - - - junit - junit - 4.13.2 - test - - - - org.jacoco - org.jacoco.agent - 0.8.7 - test - - - - org.luaj - luaj-jse - 3.0.1 - test - - @@ -109,32 +70,6 @@ - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.2.3 - - - org.apache.maven.surefire - surefire-junit-platform - 3.2.3 - - - - org.codehaus.mojo flatten-maven-plugin diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index bac1287..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.application.name=cache-man