From 19ef4f12621d2303e6bc651a212b7cc1ac85116d Mon Sep 17 00:00:00 2001
From: SerLiunx-ctrl <17689543@qq.com>
Date: Wed, 26 Mar 2025 20:28:09 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"change:=20=E8=B0=83=E6=95=B4=E5=B7=A5?=
=?UTF-8?q?=E7=A8=8B=E7=BB=93=E6=9E=84."?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit f6a3b336decb9588a25053a680a97f135e3c87b9.
---
pom.xml | 5 -----
.../exception/StateException.java | 2 +-
.../machine/AbstractStateMachine.java | 10 ++++-----
.../machine/ConcurrentStateMachine.java | 2 +-
.../DefaultConcurrentStateMachine.java | 4 ++--
.../machine/StandardStateMachine.java | 4 ++--
.../machine/StateMachine.java | 7 +++---
.../machine/StateMachineBuilder.java | 6 ++---
.../machine/StateMachineContext.java | 11 ++++++----
.../machine/StateMachineType.java | 2 +-
.../machine/handler/StateHandler.java | 2 +-
.../handler/StateHandlerProcessParams.java | 2 +-
.../machine/handler/StateHandlerRegistry.java | 2 +-
.../machine/handler/StateHandlerWrapper.java | 2 +-
.../manager/AbstractStateManager.java | 2 +-
.../manager/BidirectionalStateManager.java | 2 +-
.../BreakageUnidirectionalStateManager.java | 4 ++--
.../manager/CircleStateManager.java | 2 +-
.../DefaultBidirectionalStateManager.java | 2 +-
.../DefaultUnidirectionalStateManager.java | 2 +-
.../manager/StandardStateManager.java | 2 +-
.../manager/StateManager.java | 2 +-
.../manager/UnidirectionalStateManager.java | 2 +-
.../CountableRejectedExecutionHandler.java | 2 +-
...aultCountableRejectedExecutionHandler.java | 2 +-
.../support/ExecutorUtils.java | 2 +-
.../support/NamedThreadFactory.java | 2 +-
.../serliunx/statemanagement/MachineTest.java | 8 ++++---
.../serliunx/statemanagement/ManagerTest.java | 6 ++---
.../statemanagement/support/PrinterEvent.java | 0
.../statemanagement/support/PrinterState.java | 0
state-management-core/pom.xml | 22 -------------------
32 files changed, 51 insertions(+), 74 deletions(-)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/exception/StateException.java (91%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/machine/AbstractStateMachine.java (96%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/machine/ConcurrentStateMachine.java (95%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/machine/DefaultConcurrentStateMachine.java (97%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/machine/StandardStateMachine.java (89%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/machine/StateMachine.java (93%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/machine/StateMachineBuilder.java (97%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/machine/StateMachineContext.java (80%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/machine/StateMachineType.java (84%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/machine/handler/StateHandler.java (85%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/machine/handler/StateHandlerProcessParams.java (93%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/machine/handler/StateHandlerRegistry.java (71%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/machine/handler/StateHandlerWrapper.java (94%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/manager/AbstractStateManager.java (98%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/manager/BidirectionalStateManager.java (92%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/manager/BreakageUnidirectionalStateManager.java (95%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/manager/CircleStateManager.java (89%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/manager/DefaultBidirectionalStateManager.java (95%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/manager/DefaultUnidirectionalStateManager.java (96%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/manager/StandardStateManager.java (90%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/manager/StateManager.java (93%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/manager/UnidirectionalStateManager.java (95%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/support/CountableRejectedExecutionHandler.java (91%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/support/DefaultCountableRejectedExecutionHandler.java (94%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/support/ExecutorUtils.java (94%)
rename {state-management-core/src/main/java/com/serliunx/statemanagement/core => src/main/java/com/serliunx/statemanagement}/support/NamedThreadFactory.java (92%)
rename {state-management-core/src => src}/test/java/com/serliunx/statemanagement/MachineTest.java (87%)
rename {state-management-core/src => src}/test/java/com/serliunx/statemanagement/ManagerTest.java (79%)
rename {state-management-core/src => src}/test/java/com/serliunx/statemanagement/support/PrinterEvent.java (100%)
rename {state-management-core/src => src}/test/java/com/serliunx/statemanagement/support/PrinterState.java (100%)
delete mode 100644 state-management-core/pom.xml
diff --git a/pom.xml b/pom.xml
index af0f0b3..f83cd8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,11 +7,6 @@
com.serliunx
state-management
1.0.0-alpha
- pom
-
-
- state-management-core
-
8
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/exception/StateException.java b/src/main/java/com/serliunx/statemanagement/exception/StateException.java
similarity index 91%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/exception/StateException.java
rename to src/main/java/com/serliunx/statemanagement/exception/StateException.java
index f591989..f5db758 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/exception/StateException.java
+++ b/src/main/java/com/serliunx/statemanagement/exception/StateException.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.exception;
+package com.serliunx.statemanagement.exception;
/**
* @author SerLiunx
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/AbstractStateMachine.java b/src/main/java/com/serliunx/statemanagement/machine/AbstractStateMachine.java
similarity index 96%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/AbstractStateMachine.java
rename to src/main/java/com/serliunx/statemanagement/machine/AbstractStateMachine.java
index d2e6dd9..2df3eec 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/AbstractStateMachine.java
+++ b/src/main/java/com/serliunx/statemanagement/machine/AbstractStateMachine.java
@@ -1,9 +1,9 @@
-package com.serliunx.statemanagement.core.machine;
+package com.serliunx.statemanagement.machine;
-import com.serliunx.statemanagement.core.machine.handler.StateHandler;
-import com.serliunx.statemanagement.core.machine.handler.StateHandlerProcessParams;
-import com.serliunx.statemanagement.core.machine.handler.StateHandlerWrapper;
-import com.serliunx.statemanagement.core.manager.AbstractStateManager;
+import com.serliunx.statemanagement.machine.handler.StateHandler;
+import com.serliunx.statemanagement.machine.handler.StateHandlerProcessParams;
+import com.serliunx.statemanagement.machine.handler.StateHandlerWrapper;
+import com.serliunx.statemanagement.manager.AbstractStateManager;
import java.util.List;
import java.util.Map;
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/ConcurrentStateMachine.java b/src/main/java/com/serliunx/statemanagement/machine/ConcurrentStateMachine.java
similarity index 95%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/ConcurrentStateMachine.java
rename to src/main/java/com/serliunx/statemanagement/machine/ConcurrentStateMachine.java
index f1d1ee3..cc3cfa8 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/ConcurrentStateMachine.java
+++ b/src/main/java/com/serliunx/statemanagement/machine/ConcurrentStateMachine.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.machine;
+package com.serliunx.statemanagement.machine;
/**
* 基本行为与{@link StateMachine} 一致, 最大不同是切换状态不再使用直接的锁机制, 具体由实现类决定
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/DefaultConcurrentStateMachine.java b/src/main/java/com/serliunx/statemanagement/machine/DefaultConcurrentStateMachine.java
similarity index 97%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/DefaultConcurrentStateMachine.java
rename to src/main/java/com/serliunx/statemanagement/machine/DefaultConcurrentStateMachine.java
index 6e6da4d..4e80863 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/DefaultConcurrentStateMachine.java
+++ b/src/main/java/com/serliunx/statemanagement/machine/DefaultConcurrentStateMachine.java
@@ -1,6 +1,6 @@
-package com.serliunx.statemanagement.core.machine;
+package com.serliunx.statemanagement.machine;
-import com.serliunx.statemanagement.core.machine.handler.StateHandlerWrapper;
+import com.serliunx.statemanagement.machine.handler.StateHandlerWrapper;
import java.util.List;
import java.util.Map;
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/StandardStateMachine.java b/src/main/java/com/serliunx/statemanagement/machine/StandardStateMachine.java
similarity index 89%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/StandardStateMachine.java
rename to src/main/java/com/serliunx/statemanagement/machine/StandardStateMachine.java
index cf62f6d..143a201 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/StandardStateMachine.java
+++ b/src/main/java/com/serliunx/statemanagement/machine/StandardStateMachine.java
@@ -1,6 +1,6 @@
-package com.serliunx.statemanagement.core.machine;
+package com.serliunx.statemanagement.machine;
-import com.serliunx.statemanagement.core.machine.handler.StateHandlerWrapper;
+import com.serliunx.statemanagement.machine.handler.StateHandlerWrapper;
import java.util.List;
import java.util.Map;
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/StateMachine.java b/src/main/java/com/serliunx/statemanagement/machine/StateMachine.java
similarity index 93%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/StateMachine.java
rename to src/main/java/com/serliunx/statemanagement/machine/StateMachine.java
index 8658927..84a8c6a 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/StateMachine.java
+++ b/src/main/java/com/serliunx/statemanagement/machine/StateMachine.java
@@ -1,7 +1,6 @@
-package com.serliunx.statemanagement.core.machine;
+package com.serliunx.statemanagement.machine;
-import com.serliunx.statemanagement.core.manager.StateManager;
-import com.serliunx.statemanagement.core.manager.BidirectionalStateManager;
+import com.serliunx.statemanagement.manager.BidirectionalStateManager;
/**
* 状态机定义
@@ -19,7 +18,7 @@ import com.serliunx.statemanagement.core.manager.BidirectionalStateManager;
* @since 2024/12/28
* @see StateMachineBuilder
* @see BidirectionalStateManager
- * @see StateManager
+ * @see com.serliunx.statemanagement.manager.StateManager
*/
public interface StateMachine extends BidirectionalStateManager, AutoCloseable {
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/StateMachineBuilder.java b/src/main/java/com/serliunx/statemanagement/machine/StateMachineBuilder.java
similarity index 97%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/StateMachineBuilder.java
rename to src/main/java/com/serliunx/statemanagement/machine/StateMachineBuilder.java
index e138147..087a4cf 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/StateMachineBuilder.java
+++ b/src/main/java/com/serliunx/statemanagement/machine/StateMachineBuilder.java
@@ -1,7 +1,7 @@
-package com.serliunx.statemanagement.core.machine;
+package com.serliunx.statemanagement.machine;
-import com.serliunx.statemanagement.core.machine.handler.StateHandler;
-import com.serliunx.statemanagement.core.machine.handler.StateHandlerWrapper;
+import com.serliunx.statemanagement.machine.handler.StateHandler;
+import com.serliunx.statemanagement.machine.handler.StateHandlerWrapper;
import java.util.*;
import java.util.concurrent.Executor;
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/StateMachineContext.java b/src/main/java/com/serliunx/statemanagement/machine/StateMachineContext.java
similarity index 80%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/StateMachineContext.java
rename to src/main/java/com/serliunx/statemanagement/machine/StateMachineContext.java
index 3501b12..6487bd2 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/StateMachineContext.java
+++ b/src/main/java/com/serliunx/statemanagement/machine/StateMachineContext.java
@@ -1,12 +1,15 @@
-package com.serliunx.statemanagement.core.machine;
+package com.serliunx.statemanagement.machine;
-import com.serliunx.statemanagement.core.support.DefaultCountableRejectedExecutionHandler;
-import com.serliunx.statemanagement.core.machine.handler.StateHandlerWrapper;
-import com.serliunx.statemanagement.core.support.ExecutorUtils;
+import com.serliunx.statemanagement.machine.handler.StateHandlerWrapper;
+import com.serliunx.statemanagement.support.DefaultCountableRejectedExecutionHandler;
+import com.serliunx.statemanagement.support.ExecutorUtils;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executor;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
/**
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/StateMachineType.java b/src/main/java/com/serliunx/statemanagement/machine/StateMachineType.java
similarity index 84%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/StateMachineType.java
rename to src/main/java/com/serliunx/statemanagement/machine/StateMachineType.java
index e00659b..ac9ea0b 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/StateMachineType.java
+++ b/src/main/java/com/serliunx/statemanagement/machine/StateMachineType.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.machine;
+package com.serliunx.statemanagement.machine;
/**
* 状态机类型
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/handler/StateHandler.java b/src/main/java/com/serliunx/statemanagement/machine/handler/StateHandler.java
similarity index 85%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/handler/StateHandler.java
rename to src/main/java/com/serliunx/statemanagement/machine/handler/StateHandler.java
index 1ef6c35..b5a3278 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/handler/StateHandler.java
+++ b/src/main/java/com/serliunx/statemanagement/machine/handler/StateHandler.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.machine.handler;
+package com.serliunx.statemanagement.machine.handler;
/**
* 状态处理器
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/handler/StateHandlerProcessParams.java b/src/main/java/com/serliunx/statemanagement/machine/handler/StateHandlerProcessParams.java
similarity index 93%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/handler/StateHandlerProcessParams.java
rename to src/main/java/com/serliunx/statemanagement/machine/handler/StateHandlerProcessParams.java
index 9c43ab6..9f1c2bb 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/handler/StateHandlerProcessParams.java
+++ b/src/main/java/com/serliunx/statemanagement/machine/handler/StateHandlerProcessParams.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.machine.handler;
+package com.serliunx.statemanagement.machine.handler;
/**
* 状态处理器入参
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/handler/StateHandlerRegistry.java b/src/main/java/com/serliunx/statemanagement/machine/handler/StateHandlerRegistry.java
similarity index 71%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/handler/StateHandlerRegistry.java
rename to src/main/java/com/serliunx/statemanagement/machine/handler/StateHandlerRegistry.java
index c18826f..6485f07 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/handler/StateHandlerRegistry.java
+++ b/src/main/java/com/serliunx/statemanagement/machine/handler/StateHandlerRegistry.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.machine.handler;
+package com.serliunx.statemanagement.machine.handler;
/**
* @author SerLiunx
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/handler/StateHandlerWrapper.java b/src/main/java/com/serliunx/statemanagement/machine/handler/StateHandlerWrapper.java
similarity index 94%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/handler/StateHandlerWrapper.java
rename to src/main/java/com/serliunx/statemanagement/machine/handler/StateHandlerWrapper.java
index a84d85f..58c26f1 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/machine/handler/StateHandlerWrapper.java
+++ b/src/main/java/com/serliunx/statemanagement/machine/handler/StateHandlerWrapper.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.machine.handler;
+package com.serliunx.statemanagement.machine.handler;
import java.util.concurrent.Executor;
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/AbstractStateManager.java b/src/main/java/com/serliunx/statemanagement/manager/AbstractStateManager.java
similarity index 98%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/AbstractStateManager.java
rename to src/main/java/com/serliunx/statemanagement/manager/AbstractStateManager.java
index c5cc924..b96615c 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/AbstractStateManager.java
+++ b/src/main/java/com/serliunx/statemanagement/manager/AbstractStateManager.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.manager;
+package com.serliunx.statemanagement.manager;
import java.util.Arrays;
import java.util.List;
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/BidirectionalStateManager.java b/src/main/java/com/serliunx/statemanagement/manager/BidirectionalStateManager.java
similarity index 92%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/BidirectionalStateManager.java
rename to src/main/java/com/serliunx/statemanagement/manager/BidirectionalStateManager.java
index d5d1024..c5e0b67 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/BidirectionalStateManager.java
+++ b/src/main/java/com/serliunx/statemanagement/manager/BidirectionalStateManager.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.manager;
+package com.serliunx.statemanagement.manager;
/**
* 双向流转的状态管理器
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/BreakageUnidirectionalStateManager.java b/src/main/java/com/serliunx/statemanagement/manager/BreakageUnidirectionalStateManager.java
similarity index 95%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/BreakageUnidirectionalStateManager.java
rename to src/main/java/com/serliunx/statemanagement/manager/BreakageUnidirectionalStateManager.java
index 31d710d..0073e98 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/BreakageUnidirectionalStateManager.java
+++ b/src/main/java/com/serliunx/statemanagement/manager/BreakageUnidirectionalStateManager.java
@@ -1,6 +1,6 @@
-package com.serliunx.statemanagement.core.manager;
+package com.serliunx.statemanagement.manager;
-import com.serliunx.statemanagement.core.exception.StateException;
+import com.serliunx.statemanagement.exception.StateException;
import java.util.List;
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/CircleStateManager.java b/src/main/java/com/serliunx/statemanagement/manager/CircleStateManager.java
similarity index 89%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/CircleStateManager.java
rename to src/main/java/com/serliunx/statemanagement/manager/CircleStateManager.java
index 9a0e644..c6e86f1 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/CircleStateManager.java
+++ b/src/main/java/com/serliunx/statemanagement/manager/CircleStateManager.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.manager;
+package com.serliunx.statemanagement.manager;
/**
* 将指定状态管理器标记为循环的状态管理器
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/DefaultBidirectionalStateManager.java b/src/main/java/com/serliunx/statemanagement/manager/DefaultBidirectionalStateManager.java
similarity index 95%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/DefaultBidirectionalStateManager.java
rename to src/main/java/com/serliunx/statemanagement/manager/DefaultBidirectionalStateManager.java
index bea622a..b288725 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/DefaultBidirectionalStateManager.java
+++ b/src/main/java/com/serliunx/statemanagement/manager/DefaultBidirectionalStateManager.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.manager;
+package com.serliunx.statemanagement.manager;
import java.util.List;
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/DefaultUnidirectionalStateManager.java b/src/main/java/com/serliunx/statemanagement/manager/DefaultUnidirectionalStateManager.java
similarity index 96%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/DefaultUnidirectionalStateManager.java
rename to src/main/java/com/serliunx/statemanagement/manager/DefaultUnidirectionalStateManager.java
index 3bb1a5a..1e13604 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/DefaultUnidirectionalStateManager.java
+++ b/src/main/java/com/serliunx/statemanagement/manager/DefaultUnidirectionalStateManager.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.manager;
+package com.serliunx.statemanagement.manager;
import java.util.List;
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/StandardStateManager.java b/src/main/java/com/serliunx/statemanagement/manager/StandardStateManager.java
similarity index 90%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/StandardStateManager.java
rename to src/main/java/com/serliunx/statemanagement/manager/StandardStateManager.java
index e6644f2..0e1c2b1 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/StandardStateManager.java
+++ b/src/main/java/com/serliunx/statemanagement/manager/StandardStateManager.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.manager;
+package com.serliunx.statemanagement.manager;
import java.util.List;
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/StateManager.java b/src/main/java/com/serliunx/statemanagement/manager/StateManager.java
similarity index 93%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/StateManager.java
rename to src/main/java/com/serliunx/statemanagement/manager/StateManager.java
index ecf1328..dcada0b 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/StateManager.java
+++ b/src/main/java/com/serliunx/statemanagement/manager/StateManager.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.manager;
+package com.serliunx.statemanagement.manager;
/**
* 状态管理器
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/UnidirectionalStateManager.java b/src/main/java/com/serliunx/statemanagement/manager/UnidirectionalStateManager.java
similarity index 95%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/UnidirectionalStateManager.java
rename to src/main/java/com/serliunx/statemanagement/manager/UnidirectionalStateManager.java
index df57740..d2d9f62 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/manager/UnidirectionalStateManager.java
+++ b/src/main/java/com/serliunx/statemanagement/manager/UnidirectionalStateManager.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.manager;
+package com.serliunx.statemanagement.manager;
/**
* 单向流转的状态管理器
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/support/CountableRejectedExecutionHandler.java b/src/main/java/com/serliunx/statemanagement/support/CountableRejectedExecutionHandler.java
similarity index 91%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/support/CountableRejectedExecutionHandler.java
rename to src/main/java/com/serliunx/statemanagement/support/CountableRejectedExecutionHandler.java
index a6d2aa0..0854a60 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/support/CountableRejectedExecutionHandler.java
+++ b/src/main/java/com/serliunx/statemanagement/support/CountableRejectedExecutionHandler.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.support;
+package com.serliunx.statemanagement.support;
import java.util.concurrent.RejectedExecutionHandler;
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/support/DefaultCountableRejectedExecutionHandler.java b/src/main/java/com/serliunx/statemanagement/support/DefaultCountableRejectedExecutionHandler.java
similarity index 94%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/support/DefaultCountableRejectedExecutionHandler.java
rename to src/main/java/com/serliunx/statemanagement/support/DefaultCountableRejectedExecutionHandler.java
index 2cfb7ee..f23748d 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/support/DefaultCountableRejectedExecutionHandler.java
+++ b/src/main/java/com/serliunx/statemanagement/support/DefaultCountableRejectedExecutionHandler.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.support;
+package com.serliunx.statemanagement.support;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.atomic.AtomicLong;
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/support/ExecutorUtils.java b/src/main/java/com/serliunx/statemanagement/support/ExecutorUtils.java
similarity index 94%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/support/ExecutorUtils.java
rename to src/main/java/com/serliunx/statemanagement/support/ExecutorUtils.java
index 3f9f986..e3ff2df 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/support/ExecutorUtils.java
+++ b/src/main/java/com/serliunx/statemanagement/support/ExecutorUtils.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.support;
+package com.serliunx.statemanagement.support;
import java.util.concurrent.*;
diff --git a/state-management-core/src/main/java/com/serliunx/statemanagement/core/support/NamedThreadFactory.java b/src/main/java/com/serliunx/statemanagement/support/NamedThreadFactory.java
similarity index 92%
rename from state-management-core/src/main/java/com/serliunx/statemanagement/core/support/NamedThreadFactory.java
rename to src/main/java/com/serliunx/statemanagement/support/NamedThreadFactory.java
index 27c5ed9..7b12e7d 100644
--- a/state-management-core/src/main/java/com/serliunx/statemanagement/core/support/NamedThreadFactory.java
+++ b/src/main/java/com/serliunx/statemanagement/support/NamedThreadFactory.java
@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.support;
+package com.serliunx.statemanagement.support;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/state-management-core/src/test/java/com/serliunx/statemanagement/MachineTest.java b/src/test/java/com/serliunx/statemanagement/MachineTest.java
similarity index 87%
rename from state-management-core/src/test/java/com/serliunx/statemanagement/MachineTest.java
rename to src/test/java/com/serliunx/statemanagement/MachineTest.java
index 6dbb254..4b40116 100644
--- a/state-management-core/src/test/java/com/serliunx/statemanagement/MachineTest.java
+++ b/src/test/java/com/serliunx/statemanagement/MachineTest.java
@@ -1,12 +1,14 @@
package com.serliunx.statemanagement;
-import com.serliunx.statemanagement.core.machine.ConcurrentStateMachine;
-import com.serliunx.statemanagement.core.machine.StateMachine;
-import com.serliunx.statemanagement.core.machine.StateMachineBuilder;
+import com.serliunx.statemanagement.machine.ConcurrentStateMachine;
+import com.serliunx.statemanagement.machine.StateMachine;
+import com.serliunx.statemanagement.machine.StateMachineBuilder;
import com.serliunx.statemanagement.support.PrinterEvent;
import com.serliunx.statemanagement.support.PrinterState;
import org.junit.Test;
+import java.util.concurrent.Executors;
+
/**
* 状态机测试
*
diff --git a/state-management-core/src/test/java/com/serliunx/statemanagement/ManagerTest.java b/src/test/java/com/serliunx/statemanagement/ManagerTest.java
similarity index 79%
rename from state-management-core/src/test/java/com/serliunx/statemanagement/ManagerTest.java
rename to src/test/java/com/serliunx/statemanagement/ManagerTest.java
index 784e27b..954d73c 100644
--- a/state-management-core/src/test/java/com/serliunx/statemanagement/ManagerTest.java
+++ b/src/test/java/com/serliunx/statemanagement/ManagerTest.java
@@ -1,8 +1,8 @@
package com.serliunx.statemanagement;
-import com.serliunx.statemanagement.core.manager.BreakageUnidirectionalStateManager;
-import com.serliunx.statemanagement.core.manager.DefaultUnidirectionalStateManager;
-import com.serliunx.statemanagement.core.manager.UnidirectionalStateManager;
+import com.serliunx.statemanagement.manager.BreakageUnidirectionalStateManager;
+import com.serliunx.statemanagement.manager.DefaultUnidirectionalStateManager;
+import com.serliunx.statemanagement.manager.UnidirectionalStateManager;
import com.serliunx.statemanagement.support.PrinterState;
import org.junit.Test;
diff --git a/state-management-core/src/test/java/com/serliunx/statemanagement/support/PrinterEvent.java b/src/test/java/com/serliunx/statemanagement/support/PrinterEvent.java
similarity index 100%
rename from state-management-core/src/test/java/com/serliunx/statemanagement/support/PrinterEvent.java
rename to src/test/java/com/serliunx/statemanagement/support/PrinterEvent.java
diff --git a/state-management-core/src/test/java/com/serliunx/statemanagement/support/PrinterState.java b/src/test/java/com/serliunx/statemanagement/support/PrinterState.java
similarity index 100%
rename from state-management-core/src/test/java/com/serliunx/statemanagement/support/PrinterState.java
rename to src/test/java/com/serliunx/statemanagement/support/PrinterState.java
diff --git a/state-management-core/pom.xml b/state-management-core/pom.xml
deleted file mode 100644
index 9c7e575..0000000
--- a/state-management-core/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- 4.0.0
-
-
- com.serliunx
- state-management
- 1.0.0-alpha
-
-
- jar
- state-management-core
-
-
- 8
- 8
- UTF-8
-
-
-
\ No newline at end of file