From 932682b6e12f49b959be98b57d6f7656035ce89c Mon Sep 17 00:00:00 2001 From: Daniil Date: Fri, 3 Aug 2018 21:18:34 +0700 Subject: [PATCH] Event loop module restructured --- .../mc/core/events/{v3 => }/EventPipeline.java | 8 ++++---- .../core/events/{v3 => }/FullAsyncEventLoop.java | 9 +++++---- .../events/{v3 => }/RegisteredEventHandler.java | 5 +++-- .../mc/core/events/{ => api}/EventHandler.java | 2 +- .../mc/core/events/{ => api}/EventPriority.java | 2 +- .../core/events/{v3 => api}/EventQueueOwner.java | 2 +- .../mc/core/events/{ => api}/LockableResource.java | 2 +- .../java/mc/core/events/{v3 => api}/Plugin.java | 2 +- .../events/{v3 => }/lock/CustomReentrantLock.java | 4 ++-- .../{v3 => }/runner/EventExecutorService.java | 2 +- .../events/{v3 => }/runner/ExecutorThread.java | 2 +- .../events/{v3 => }/runner/ResourceRunnable.java | 2 +- .../events/{v3 => }/runner/ScheduleStrategy.java | 2 +- .../v3 => mc/core/events}/EventExecutorTest.java | 6 +++--- .../v3 => mc/core/events}/EventLoopTest.java | 14 ++++++-------- 15 files changed, 32 insertions(+), 32 deletions(-) rename event-loop/src/main/java/mc/core/events/{v3 => }/EventPipeline.java (92%) rename event-loop/src/main/java/mc/core/events/{v3 => }/FullAsyncEventLoop.java (95%) rename event-loop/src/main/java/mc/core/events/{v3 => }/RegisteredEventHandler.java (80%) rename event-loop/src/main/java/mc/core/events/{ => api}/EventHandler.java (92%) rename event-loop/src/main/java/mc/core/events/{ => api}/EventPriority.java (89%) rename event-loop/src/main/java/mc/core/events/{v3 => api}/EventQueueOwner.java (57%) rename event-loop/src/main/java/mc/core/events/{ => api}/LockableResource.java (67%) rename event-loop/src/main/java/mc/core/events/{v3 => api}/Plugin.java (50%) rename event-loop/src/main/java/mc/core/events/{v3 => }/lock/CustomReentrantLock.java (92%) rename event-loop/src/main/java/mc/core/events/{v3 => }/runner/EventExecutorService.java (98%) rename event-loop/src/main/java/mc/core/events/{v3 => }/runner/ExecutorThread.java (95%) rename event-loop/src/main/java/mc/core/events/{v3 => }/runner/ResourceRunnable.java (82%) rename event-loop/src/main/java/mc/core/events/{v3 => }/runner/ScheduleStrategy.java (74%) rename event-loop/src/test/java/{ru/core/events/v3 => mc/core/events}/EventExecutorTest.java (88%) rename event-loop/src/test/java/{ru/core/events/v3 => mc/core/events}/EventLoopTest.java (94%) diff --git a/event-loop/src/main/java/mc/core/events/v3/EventPipeline.java b/event-loop/src/main/java/mc/core/events/EventPipeline.java similarity index 92% rename from event-loop/src/main/java/mc/core/events/v3/EventPipeline.java rename to event-loop/src/main/java/mc/core/events/EventPipeline.java index f2aaa68..e3a2910 100644 --- a/event-loop/src/main/java/mc/core/events/v3/EventPipeline.java +++ b/event-loop/src/main/java/mc/core/events/EventPipeline.java @@ -1,12 +1,12 @@ -package mc.core.events.v3; +package mc.core.events; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import mc.core.events.Event; -import mc.core.events.v3.runner.EventExecutorService; -import mc.core.events.v3.runner.ResourceRunnable; +import mc.core.events.api.EventQueueOwner; +import mc.core.events.runner.EventExecutorService; +import mc.core.events.runner.ResourceRunnable; import java.lang.reflect.InvocationTargetException; import java.util.List; diff --git a/event-loop/src/main/java/mc/core/events/v3/FullAsyncEventLoop.java b/event-loop/src/main/java/mc/core/events/FullAsyncEventLoop.java similarity index 95% rename from event-loop/src/main/java/mc/core/events/v3/FullAsyncEventLoop.java rename to event-loop/src/main/java/mc/core/events/FullAsyncEventLoop.java index a88e2e9..2b8db05 100644 --- a/event-loop/src/main/java/mc/core/events/v3/FullAsyncEventLoop.java +++ b/event-loop/src/main/java/mc/core/events/FullAsyncEventLoop.java @@ -1,10 +1,11 @@ -package mc.core.events.v3; +package mc.core.events; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import mc.core.events.Event; -import mc.core.events.EventHandler; -import mc.core.events.v3.runner.EventExecutorService; +import mc.core.events.api.EventHandler; +import mc.core.events.api.EventQueueOwner; +import mc.core.events.api.Plugin; +import mc.core.events.runner.EventExecutorService; import org.springframework.beans.factory.annotation.Autowired; import java.lang.reflect.Method; diff --git a/event-loop/src/main/java/mc/core/events/v3/RegisteredEventHandler.java b/event-loop/src/main/java/mc/core/events/RegisteredEventHandler.java similarity index 80% rename from event-loop/src/main/java/mc/core/events/v3/RegisteredEventHandler.java rename to event-loop/src/main/java/mc/core/events/RegisteredEventHandler.java index ae708e2..bae22ff 100644 --- a/event-loop/src/main/java/mc/core/events/v3/RegisteredEventHandler.java +++ b/event-loop/src/main/java/mc/core/events/RegisteredEventHandler.java @@ -1,8 +1,9 @@ -package mc.core.events.v3; +package mc.core.events; import lombok.Getter; import lombok.RequiredArgsConstructor; -import mc.core.events.LockableResource; +import mc.core.events.api.LockableResource; +import mc.core.events.api.Plugin; import java.lang.reflect.Method; diff --git a/event-loop/src/main/java/mc/core/events/EventHandler.java b/event-loop/src/main/java/mc/core/events/api/EventHandler.java similarity index 92% rename from event-loop/src/main/java/mc/core/events/EventHandler.java rename to event-loop/src/main/java/mc/core/events/api/EventHandler.java index 0def90c..dbf255d 100644 --- a/event-loop/src/main/java/mc/core/events/EventHandler.java +++ b/event-loop/src/main/java/mc/core/events/api/EventHandler.java @@ -1,4 +1,4 @@ -package mc.core.events; +package mc.core.events.api; import java.lang.annotation.*; diff --git a/event-loop/src/main/java/mc/core/events/EventPriority.java b/event-loop/src/main/java/mc/core/events/api/EventPriority.java similarity index 89% rename from event-loop/src/main/java/mc/core/events/EventPriority.java rename to event-loop/src/main/java/mc/core/events/api/EventPriority.java index 5a889eb..0c6fdce 100644 --- a/event-loop/src/main/java/mc/core/events/EventPriority.java +++ b/event-loop/src/main/java/mc/core/events/api/EventPriority.java @@ -1,4 +1,4 @@ -package mc.core.events; +package mc.core.events.api; import lombok.Getter; diff --git a/event-loop/src/main/java/mc/core/events/v3/EventQueueOwner.java b/event-loop/src/main/java/mc/core/events/api/EventQueueOwner.java similarity index 57% rename from event-loop/src/main/java/mc/core/events/v3/EventQueueOwner.java rename to event-loop/src/main/java/mc/core/events/api/EventQueueOwner.java index 996b159..49f4fd4 100644 --- a/event-loop/src/main/java/mc/core/events/v3/EventQueueOwner.java +++ b/event-loop/src/main/java/mc/core/events/api/EventQueueOwner.java @@ -1,4 +1,4 @@ -package mc.core.events.v3; +package mc.core.events.api; public interface EventQueueOwner { } diff --git a/event-loop/src/main/java/mc/core/events/LockableResource.java b/event-loop/src/main/java/mc/core/events/api/LockableResource.java similarity index 67% rename from event-loop/src/main/java/mc/core/events/LockableResource.java rename to event-loop/src/main/java/mc/core/events/api/LockableResource.java index 3d8c459..f6408c7 100644 --- a/event-loop/src/main/java/mc/core/events/LockableResource.java +++ b/event-loop/src/main/java/mc/core/events/api/LockableResource.java @@ -1,4 +1,4 @@ -package mc.core.events; +package mc.core.events.api; public enum LockableResource { PLAYER, diff --git a/event-loop/src/main/java/mc/core/events/v3/Plugin.java b/event-loop/src/main/java/mc/core/events/api/Plugin.java similarity index 50% rename from event-loop/src/main/java/mc/core/events/v3/Plugin.java rename to event-loop/src/main/java/mc/core/events/api/Plugin.java index 670bd82..040ab60 100644 --- a/event-loop/src/main/java/mc/core/events/v3/Plugin.java +++ b/event-loop/src/main/java/mc/core/events/api/Plugin.java @@ -1,4 +1,4 @@ -package mc.core.events.v3; +package mc.core.events.api; public interface Plugin { } diff --git a/event-loop/src/main/java/mc/core/events/v3/lock/CustomReentrantLock.java b/event-loop/src/main/java/mc/core/events/lock/CustomReentrantLock.java similarity index 92% rename from event-loop/src/main/java/mc/core/events/v3/lock/CustomReentrantLock.java rename to event-loop/src/main/java/mc/core/events/lock/CustomReentrantLock.java index 35bbbc2..a485f53 100644 --- a/event-loop/src/main/java/mc/core/events/v3/lock/CustomReentrantLock.java +++ b/event-loop/src/main/java/mc/core/events/lock/CustomReentrantLock.java @@ -1,6 +1,6 @@ -package mc.core.events.v3.lock; +package mc.core.events.lock; -import mc.core.events.v3.runner.ExecutorThread; +import mc.core.events.runner.ExecutorThread; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; diff --git a/event-loop/src/main/java/mc/core/events/v3/runner/EventExecutorService.java b/event-loop/src/main/java/mc/core/events/runner/EventExecutorService.java similarity index 98% rename from event-loop/src/main/java/mc/core/events/v3/runner/EventExecutorService.java rename to event-loop/src/main/java/mc/core/events/runner/EventExecutorService.java index 93bbee7..95f1eac 100644 --- a/event-loop/src/main/java/mc/core/events/v3/runner/EventExecutorService.java +++ b/event-loop/src/main/java/mc/core/events/runner/EventExecutorService.java @@ -1,4 +1,4 @@ -package mc.core.events.v3.runner; +package mc.core.events.runner; import sun.plugin.dom.exception.InvalidStateException; diff --git a/event-loop/src/main/java/mc/core/events/v3/runner/ExecutorThread.java b/event-loop/src/main/java/mc/core/events/runner/ExecutorThread.java similarity index 95% rename from event-loop/src/main/java/mc/core/events/v3/runner/ExecutorThread.java rename to event-loop/src/main/java/mc/core/events/runner/ExecutorThread.java index 3c18421..4c12b26 100644 --- a/event-loop/src/main/java/mc/core/events/v3/runner/ExecutorThread.java +++ b/event-loop/src/main/java/mc/core/events/runner/ExecutorThread.java @@ -1,4 +1,4 @@ -package mc.core.events.v3.runner; +package mc.core.events.runner; public class ExecutorThread extends Thread { private EventExecutorService service; diff --git a/event-loop/src/main/java/mc/core/events/v3/runner/ResourceRunnable.java b/event-loop/src/main/java/mc/core/events/runner/ResourceRunnable.java similarity index 82% rename from event-loop/src/main/java/mc/core/events/v3/runner/ResourceRunnable.java rename to event-loop/src/main/java/mc/core/events/runner/ResourceRunnable.java index 3c452ac..74d9528 100644 --- a/event-loop/src/main/java/mc/core/events/v3/runner/ResourceRunnable.java +++ b/event-loop/src/main/java/mc/core/events/runner/ResourceRunnable.java @@ -1,4 +1,4 @@ -package mc.core.events.v3.runner; +package mc.core.events.runner; public interface ResourceRunnable extends Runnable { default void lock() { diff --git a/event-loop/src/main/java/mc/core/events/v3/runner/ScheduleStrategy.java b/event-loop/src/main/java/mc/core/events/runner/ScheduleStrategy.java similarity index 74% rename from event-loop/src/main/java/mc/core/events/v3/runner/ScheduleStrategy.java rename to event-loop/src/main/java/mc/core/events/runner/ScheduleStrategy.java index f901d85..9d4ff50 100644 --- a/event-loop/src/main/java/mc/core/events/v3/runner/ScheduleStrategy.java +++ b/event-loop/src/main/java/mc/core/events/runner/ScheduleStrategy.java @@ -1,4 +1,4 @@ -package mc.core.events.v3.runner; +package mc.core.events.runner; public interface ScheduleStrategy { ResourceRunnable getTask() throws InterruptedException; diff --git a/event-loop/src/test/java/ru/core/events/v3/EventExecutorTest.java b/event-loop/src/test/java/mc/core/events/EventExecutorTest.java similarity index 88% rename from event-loop/src/test/java/ru/core/events/v3/EventExecutorTest.java rename to event-loop/src/test/java/mc/core/events/EventExecutorTest.java index a478f49..871f02e 100644 --- a/event-loop/src/test/java/ru/core/events/v3/EventExecutorTest.java +++ b/event-loop/src/test/java/mc/core/events/EventExecutorTest.java @@ -1,7 +1,7 @@ -package ru.core.events.v3; +package mc.core.events; -import mc.core.events.v3.runner.EventExecutorService; -import mc.core.events.v3.runner.ResourceRunnable; +import mc.core.events.runner.EventExecutorService; +import mc.core.events.runner.ResourceRunnable; import org.junit.Assert; import org.junit.Test; diff --git a/event-loop/src/test/java/ru/core/events/v3/EventLoopTest.java b/event-loop/src/test/java/mc/core/events/EventLoopTest.java similarity index 94% rename from event-loop/src/test/java/ru/core/events/v3/EventLoopTest.java rename to event-loop/src/test/java/mc/core/events/EventLoopTest.java index 8dc75d9..bb43297 100644 --- a/event-loop/src/test/java/ru/core/events/v3/EventLoopTest.java +++ b/event-loop/src/test/java/mc/core/events/EventLoopTest.java @@ -1,12 +1,10 @@ -package ru.core.events.v3; +package mc.core.events; -import mc.core.events.EventHandler; -import mc.core.events.EventPriority; -import mc.core.events.LoginEvent; -import mc.core.events.v3.EventQueueOwner; -import mc.core.events.v3.FullAsyncEventLoop; -import mc.core.events.v3.Plugin; -import mc.core.events.v3.runner.EventExecutorService; +import mc.core.events.api.EventHandler; +import mc.core.events.api.EventPriority; +import mc.core.events.api.EventQueueOwner; +import mc.core.events.api.Plugin; +import mc.core.events.runner.EventExecutorService; import org.junit.Assert; import org.junit.Test;