Revert "change: 调整工程结构."

This reverts commit f6a3b336de.

pom.xml

@@ -7,11 +7,6 @@
     <groupId>com.serliunx</groupId>
     <artifactId>state-management</artifactId>
     <version>1.0.0-alpha</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>state-management-core</module>
-    </modules>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

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 <a href="mailto:serliunx@yeah.net">SerLiunx</a>

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;

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} 一致, 最大不同是切换状态不再使用直接的锁机制, 具体由实现类决定

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;

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;

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<S> extends BidirectionalStateManager<S>, AutoCloseable {
 

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;

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;
 
 /**

src/main/java/com/serliunx/statemanagement/machine/StateMachineType.java

@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.machine;
+package com.serliunx.statemanagement.machine;
 
 /**
  * 状态机类型

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;
 
 /**
  * 状态处理器

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;
 
 /**
  * 状态处理器入参

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 <a href="mailto:serliunx@yeah.net">SerLiunx</a>

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;
 

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;

src/main/java/com/serliunx/statemanagement/manager/BidirectionalStateManager.java

@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.manager;
+package com.serliunx.statemanagement.manager;
 
 /**
  * 双向流转的状态管理器

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;
 

src/main/java/com/serliunx/statemanagement/manager/CircleStateManager.java

@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.manager;
+package com.serliunx.statemanagement.manager;
 
 /**
  * 将指定状态管理器标记为循环的状态管理器

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;
 

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;
 

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;
 

src/main/java/com/serliunx/statemanagement/manager/StateManager.java

@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.manager;
+package com.serliunx.statemanagement.manager;
 
 /**
  * 状态管理器

src/main/java/com/serliunx/statemanagement/manager/UnidirectionalStateManager.java

@@ -1,4 +1,4 @@
-package com.serliunx.statemanagement.core.manager;
+package com.serliunx.statemanagement.manager;
 
 /**
  * 单向流转的状态管理器

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;
 

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;

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.*;
 

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;

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;
+
 /**
  * 状态机测试
  *

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;
 

state-management-core/pom.xml

@@ -1,22 +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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.serliunx</groupId>
-        <artifactId>state-management</artifactId>
-        <version>1.0.0-alpha</version>
-    </parent>
-
-    <packaging>jar</packaging>
-    <artifactId>state-management-core</artifactId>
-
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-</project>