From 3b9e373aae887ffcb9d7700f54e12fb636f2e43b Mon Sep 17 00:00:00 2001
From: MageByte <zero_develop@163.com>
Date: Sat, 18 Jul 2020 15:08:31 +0800
Subject: [PATCH] refactor(sequence): delete plugin and move to boot

---
 .../ApiBootSequenceAutoConfiguration.java     |  4 +--
 .../sequence/ApiBootSequenceContext.java      |  5 ++--
 .../api-boot-plugin-sequence/pom.xml          | 26 -------------------
 api-boot-project/api-boot-plugins/pom.xml     |  1 -
 .../api-boot-starter-sequence/pom.xml         |  4 ---
 .../api/boot}/sequence/Sequence.java          |  2 +-
 .../api/boot}/sequence/SystemClock.java       |  2 +-
 7 files changed, 7 insertions(+), 37 deletions(-)
 delete mode 100644 api-boot-project/api-boot-plugins/api-boot-plugin-sequence/pom.xml
 rename api-boot-project/{api-boot-plugins/api-boot-plugin-sequence/src/main/java/org/minbox/framework/api/boot/plugin => api-boot/src/main/java/org/minbox/framework/api/boot}/sequence/Sequence.java (99%)
 rename api-boot-project/{api-boot-plugins/api-boot-plugin-sequence/src/main/java/org/minbox/framework/api/boot/plugin => api-boot/src/main/java/org/minbox/framework/api/boot}/sequence/SystemClock.java (97%)

diff --git a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/sequence/ApiBootSequenceAutoConfiguration.java b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/sequence/ApiBootSequenceAutoConfiguration.java
index 3557fb75..c873131e 100644
--- a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/sequence/ApiBootSequenceAutoConfiguration.java
+++ b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/sequence/ApiBootSequenceAutoConfiguration.java
@@ -1,6 +1,6 @@
 package org.minbox.framework.api.boot.autoconfigure.sequence;
 
-import org.minbox.framework.api.boot.plugin.sequence.Sequence;
+import org.minbox.framework.api.boot.sequence.Sequence;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -19,7 +19,7 @@ public class ApiBootSequenceAutoConfiguration {
     /**
      * 注入 "Sequence" 所需要的属性配置类
      */
-    private ApiBootSequenceProperties apiBootSequenceProperties;
+    private final ApiBootSequenceProperties apiBootSequenceProperties;
 
     public ApiBootSequenceAutoConfiguration(ApiBootSequenceProperties apiBootSequenceProperties) {
         this.apiBootSequenceProperties = apiBootSequenceProperties;
diff --git a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/sequence/ApiBootSequenceContext.java b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/sequence/ApiBootSequenceContext.java
index ca673f58..b89f5653 100644
--- a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/sequence/ApiBootSequenceContext.java
+++ b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/sequence/ApiBootSequenceContext.java
@@ -1,6 +1,7 @@
 package org.minbox.framework.api.boot.autoconfigure.sequence;
 
-import org.minbox.framework.api.boot.plugin.sequence.Sequence;
+
+import org.minbox.framework.api.boot.sequence.Sequence;
 
 /**
  * 封装{@link Sequence}的上下文
@@ -13,7 +14,7 @@ public class ApiBootSequenceContext {
     /**
      * 分布式唯一ID实例
      */
-    private Sequence sequence;
+    private final Sequence sequence;
 
     /**
      * 构造函数实例化{@link Sequence}
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-sequence/pom.xml b/api-boot-project/api-boot-plugins/api-boot-plugin-sequence/pom.xml
deleted file mode 100644
index 4299c679..00000000
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-sequence/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>api-boot-plugins</artifactId>
-        <groupId>org.minbox.framework</groupId>
-        <version>${revision}</version>
-    </parent>
-    <artifactId>api-boot-plugin-sequence</artifactId>
-    <packaging>jar</packaging>
-    <description>
-        分布式高效ID算法集成，基于Twitter的Snowflake（"雪花算法"）算法实现分布式高效有序ID生产黑科技
-
-        Distributed efficient ID algorithm integration,
-        based on Twitter's Snowflake algorithm to achieve distributed efficient and orderly ID production black
-        technology.
-
-        See more details：https://gitee.com/yu120/sequence
-    </description>
-    <modelVersion>4.0.0</modelVersion>
-    <properties>
-        <main.basedir>${basedir}/../../..</main.basedir>
-    </properties>
-
-</project>
diff --git a/api-boot-project/api-boot-plugins/pom.xml b/api-boot-project/api-boot-plugins/pom.xml
index 05cbce64..9c47fb17 100644
--- a/api-boot-project/api-boot-plugins/pom.xml
+++ b/api-boot-project/api-boot-plugins/pom.xml
@@ -20,6 +20,5 @@
     <modules>
         <module>api-boot-plugin</module>
         <module>api-boot-plugin-resource-load</module>
-        <module>api-boot-plugin-sequence</module>
     </modules>
 </project>
diff --git a/api-boot-project/api-boot-starters/api-boot-starter-sequence/pom.xml b/api-boot-project/api-boot-starters/api-boot-starter-sequence/pom.xml
index b079e388..173a2a03 100644
--- a/api-boot-project/api-boot-starters/api-boot-starter-sequence/pom.xml
+++ b/api-boot-project/api-boot-starters/api-boot-starter-sequence/pom.xml
@@ -42,10 +42,6 @@
             <groupId>org.minbox.framework</groupId>
             <artifactId>api-boot-starter</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.minbox.framework</groupId>
-            <artifactId>api-boot-plugin-sequence</artifactId>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-sequence/src/main/java/org/minbox/framework/api/boot/plugin/sequence/Sequence.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/sequence/Sequence.java
similarity index 99%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-sequence/src/main/java/org/minbox/framework/api/boot/plugin/sequence/Sequence.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/sequence/Sequence.java
index d3e5bc46..d9508994 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-sequence/src/main/java/org/minbox/framework/api/boot/plugin/sequence/Sequence.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/sequence/Sequence.java
@@ -1,4 +1,4 @@
-package org.minbox.framework.api.boot.plugin.sequence;
+package org.minbox.framework.api.boot.sequence;
 
 import java.net.InetAddress;
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-sequence/src/main/java/org/minbox/framework/api/boot/plugin/sequence/SystemClock.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/sequence/SystemClock.java
similarity index 97%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-sequence/src/main/java/org/minbox/framework/api/boot/plugin/sequence/SystemClock.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/sequence/SystemClock.java
index 928367c1..1618642f 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-sequence/src/main/java/org/minbox/framework/api/boot/plugin/sequence/SystemClock.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/sequence/SystemClock.java
@@ -1,4 +1,4 @@
-package org.minbox.framework.api.boot.plugin.sequence;
+package org.minbox.framework.api.boot.sequence;
 
 
 import java.sql.Timestamp;