From 78b234237f44655085b3b1c418cf41c642b67eaf Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Sat, 17 Oct 2020 11:59:29 +0800
Subject: [PATCH] =?UTF-8?q?[Add][Move][Change]=20Project,=20Common,=20Core?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=20Common=20=E6=A8=A1=E5=9D=97,=20?=
 =?UTF-8?q?=E5=B0=86=20CacheStoreBuilder=20=E8=BD=AC=E7=A7=BB=E5=88=B0=20C?=
 =?UTF-8?q?ommon=20=E6=A8=A1=E5=9D=97=E4=B8=AD;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Add] net.lamgc:ContentGrabbingJi-Common 添加 Common 模块作为共用组件共享的模块;
[Move] CacheStoreBuilder, CacheStoreBuilderTest, FactoryInfo, NoSuchFactoryException 移动 Cache 相关类到 Common 模块中;
[Change] Core:pom.xml 添加 Common 模块的依赖, 调整测试项依赖;
---
 ContentGrabbingJi-common/pom.xml              | 52 +++++++++++++++++++
 .../cgj/bot/cache/CacheStoreBuilder.java      |  0
 .../net/lamgc/cgj/bot/cache/FactoryInfo.java  |  0
 .../cgj/bot/cache/NoSuchFactoryException.java |  0
 .../cgj/bot/cache/CacheStoreBuilderTest.java  |  0
 ContentGrabbingJi-core/pom.xml                | 17 ++----
 pom.xml                                       |  1 +
 7 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 ContentGrabbingJi-common/pom.xml
 rename {ContentGrabbingJi-core => ContentGrabbingJi-common}/src/main/java/net/lamgc/cgj/bot/cache/CacheStoreBuilder.java (100%)
 rename {ContentGrabbingJi-core => ContentGrabbingJi-common}/src/main/java/net/lamgc/cgj/bot/cache/FactoryInfo.java (100%)
 rename {ContentGrabbingJi-core => ContentGrabbingJi-common}/src/main/java/net/lamgc/cgj/bot/cache/NoSuchFactoryException.java (100%)
 rename {ContentGrabbingJi-core => ContentGrabbingJi-common}/src/test/java/net/lamgc/cgj/bot/cache/CacheStoreBuilderTest.java (100%)

diff --git a/ContentGrabbingJi-common/pom.xml b/ContentGrabbingJi-common/pom.xml
new file mode 100644
index 0000000..5cbb965
--- /dev/null
+++ b/ContentGrabbingJi-common/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2020  LamGC
+  ~
+  ~ ContentGrabbingJi is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU Affero General Public License as
+  ~ published by the Free Software Foundation, either version 3 of the
+  ~ License, or (at your option) any later version.
+  ~
+  ~ ContentGrabbingJi is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU Affero General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Affero General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ContentGrabbingJi</artifactId>
+        <groupId>net.lamgc</groupId>
+        <version>3.0.0-alpha-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ContentGrabbingJi-common</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>net.lamgc</groupId>
+            <artifactId>ContentGrabbingJi-CacheStore-api</artifactId>
+            <version>3.0.0-alpha-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.lamgc</groupId>
+            <artifactId>ContentGrabbingJi-CacheStore-local</artifactId>
+            <version>3.0.0-alpha-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.lamgc</groupId>
+            <artifactId>ContentGrabbingJi-CacheStore-redis</artifactId>
+            <version>3.0.0-alpha-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/ContentGrabbingJi-core/src/main/java/net/lamgc/cgj/bot/cache/CacheStoreBuilder.java b/ContentGrabbingJi-common/src/main/java/net/lamgc/cgj/bot/cache/CacheStoreBuilder.java
similarity index 100%
rename from ContentGrabbingJi-core/src/main/java/net/lamgc/cgj/bot/cache/CacheStoreBuilder.java
rename to ContentGrabbingJi-common/src/main/java/net/lamgc/cgj/bot/cache/CacheStoreBuilder.java
diff --git a/ContentGrabbingJi-core/src/main/java/net/lamgc/cgj/bot/cache/FactoryInfo.java b/ContentGrabbingJi-common/src/main/java/net/lamgc/cgj/bot/cache/FactoryInfo.java
similarity index 100%
rename from ContentGrabbingJi-core/src/main/java/net/lamgc/cgj/bot/cache/FactoryInfo.java
rename to ContentGrabbingJi-common/src/main/java/net/lamgc/cgj/bot/cache/FactoryInfo.java
diff --git a/ContentGrabbingJi-core/src/main/java/net/lamgc/cgj/bot/cache/NoSuchFactoryException.java b/ContentGrabbingJi-common/src/main/java/net/lamgc/cgj/bot/cache/NoSuchFactoryException.java
similarity index 100%
rename from ContentGrabbingJi-core/src/main/java/net/lamgc/cgj/bot/cache/NoSuchFactoryException.java
rename to ContentGrabbingJi-common/src/main/java/net/lamgc/cgj/bot/cache/NoSuchFactoryException.java
diff --git a/ContentGrabbingJi-core/src/test/java/net/lamgc/cgj/bot/cache/CacheStoreBuilderTest.java b/ContentGrabbingJi-common/src/test/java/net/lamgc/cgj/bot/cache/CacheStoreBuilderTest.java
similarity index 100%
rename from ContentGrabbingJi-core/src/test/java/net/lamgc/cgj/bot/cache/CacheStoreBuilderTest.java
rename to ContentGrabbingJi-common/src/test/java/net/lamgc/cgj/bot/cache/CacheStoreBuilderTest.java
diff --git a/ContentGrabbingJi-core/pom.xml b/ContentGrabbingJi-core/pom.xml
index d60562d..eb873ef 100644
--- a/ContentGrabbingJi-core/pom.xml
+++ b/ContentGrabbingJi-core/pom.xml
@@ -39,6 +39,11 @@
             <artifactId>ContentGrabbingJi-CacheStore-api</artifactId>
             <version>3.0.0-alpha-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>net.lamgc</groupId>
+            <artifactId>ContentGrabbingJi-common</artifactId>
+            <version>3.0.0-alpha-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>net.lamgc</groupId>
             <artifactId>ContentGrabbingJi-pixiv</artifactId>
@@ -51,18 +56,6 @@
             <version>2.8.6</version>
         </dependency>
 
-        <dependency>
-            <groupId>net.lamgc</groupId>
-            <artifactId>ContentGrabbingJi-CacheStore-local</artifactId>
-            <version>3.0.0-alpha-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.lamgc</groupId>
-            <artifactId>ContentGrabbingJi-CacheStore-redis</artifactId>
-            <version>3.0.0-alpha-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e71ab37..a8006c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
         <module>ContentGrabbingJi-CacheStore-api</module>
         <module>ContentGrabbingJi-CacheStore-redis</module>
         <module>ContentGrabbingJi-CacheStore-local</module>
+        <module>ContentGrabbingJi-common</module>
     </modules>
 
     <developers>