diff --git a/event/src/main/java/com/zfoo/event/model/anno/Bus.java b/event/src/main/java/com/zfoo/event/anno/Bus.java similarity index 95% rename from event/src/main/java/com/zfoo/event/model/anno/Bus.java rename to event/src/main/java/com/zfoo/event/anno/Bus.java index b42d3dea..adb2b830 100644 --- a/event/src/main/java/com/zfoo/event/model/anno/Bus.java +++ b/event/src/main/java/com/zfoo/event/anno/Bus.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -10,7 +9,7 @@ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.event.model.anno; +package com.zfoo.event.anno; /** * event bus thread type diff --git a/event/src/main/java/com/zfoo/event/model/anno/EventReceiver.java b/event/src/main/java/com/zfoo/event/anno/EventReceiver.java similarity index 96% rename from event/src/main/java/com/zfoo/event/model/anno/EventReceiver.java rename to event/src/main/java/com/zfoo/event/anno/EventReceiver.java index 75b4204e..2f73e9b2 100644 --- a/event/src/main/java/com/zfoo/event/model/anno/EventReceiver.java +++ b/event/src/main/java/com/zfoo/event/anno/EventReceiver.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -10,7 +9,7 @@ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.event.model.anno; +package com.zfoo.event.anno; import org.springframework.aot.hint.annotation.Reflective; diff --git a/event/src/main/java/com/zfoo/event/model/vo/EnhanceUtils.java b/event/src/main/java/com/zfoo/event/enhance/EnhanceUtils.java similarity index 97% rename from event/src/main/java/com/zfoo/event/model/vo/EnhanceUtils.java rename to event/src/main/java/com/zfoo/event/enhance/EnhanceUtils.java index c94cb9cf..a2cac871 100644 --- a/event/src/main/java/com/zfoo/event/model/vo/EnhanceUtils.java +++ b/event/src/main/java/com/zfoo/event/enhance/EnhanceUtils.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,10 +10,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.event.model.vo; +package com.zfoo.event.enhance; -import com.zfoo.event.model.anno.Bus; -import com.zfoo.event.model.event.IEvent; +import com.zfoo.event.anno.Bus; +import com.zfoo.event.model.IEvent; import com.zfoo.event.schema.NamespaceHandler; import com.zfoo.protocol.util.StringUtils; import com.zfoo.protocol.util.UuidUtils; diff --git a/event/src/main/java/com/zfoo/event/model/vo/EventReceiverDefinition.java b/event/src/main/java/com/zfoo/event/enhance/EventReceiverDefinition.java similarity index 94% rename from event/src/main/java/com/zfoo/event/model/vo/EventReceiverDefinition.java rename to event/src/main/java/com/zfoo/event/enhance/EventReceiverDefinition.java index 04a2b523..7211dd76 100644 --- a/event/src/main/java/com/zfoo/event/model/vo/EventReceiverDefinition.java +++ b/event/src/main/java/com/zfoo/event/enhance/EventReceiverDefinition.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,10 +10,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.event.model.vo; +package com.zfoo.event.enhance; -import com.zfoo.event.model.anno.Bus; -import com.zfoo.event.model.event.IEvent; +import com.zfoo.event.anno.Bus; +import com.zfoo.event.model.IEvent; import com.zfoo.protocol.util.ReflectionUtils; import java.lang.reflect.Method; diff --git a/event/src/main/java/com/zfoo/event/model/vo/IEventReceiver.java b/event/src/main/java/com/zfoo/event/enhance/IEventReceiver.java similarity index 86% rename from event/src/main/java/com/zfoo/event/model/vo/IEventReceiver.java rename to event/src/main/java/com/zfoo/event/enhance/IEventReceiver.java index 01a544b5..1e19b004 100644 --- a/event/src/main/java/com/zfoo/event/model/vo/IEventReceiver.java +++ b/event/src/main/java/com/zfoo/event/enhance/IEventReceiver.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,10 +10,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.event.model.vo; +package com.zfoo.event.enhance; -import com.zfoo.event.model.anno.Bus; -import com.zfoo.event.model.event.IEvent; +import com.zfoo.event.anno.Bus; +import com.zfoo.event.model.IEvent; /** * @author godotg diff --git a/event/src/main/java/com/zfoo/event/manager/EventBus.java b/event/src/main/java/com/zfoo/event/manager/EventBus.java index 0a3a249d..ac488049 100644 --- a/event/src/main/java/com/zfoo/event/manager/EventBus.java +++ b/event/src/main/java/com/zfoo/event/manager/EventBus.java @@ -12,13 +12,13 @@ */ package com.zfoo.event.manager; -import com.zfoo.event.model.event.IEvent; -import com.zfoo.event.model.vo.IEventReceiver; +import com.zfoo.event.enhance.IEventReceiver; +import com.zfoo.event.model.IEvent; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.collection.concurrent.CopyOnWriteHashMapLongObject; import com.zfoo.protocol.util.AssertionUtils; -import com.zfoo.protocol.util.StringUtils; import com.zfoo.protocol.util.RandomUtils; +import com.zfoo.protocol.util.StringUtils; import com.zfoo.protocol.util.ThreadUtils; import io.netty.util.concurrent.FastThreadLocalThread; import org.slf4j.Logger; diff --git a/event/src/main/java/com/zfoo/event/model/event/AppStartAfterEvent.java b/event/src/main/java/com/zfoo/event/model/AppStartAfterEvent.java similarity index 96% rename from event/src/main/java/com/zfoo/event/model/event/AppStartAfterEvent.java rename to event/src/main/java/com/zfoo/event/model/AppStartAfterEvent.java index e340cf15..1a4de5fe 100644 --- a/event/src/main/java/com/zfoo/event/model/event/AppStartAfterEvent.java +++ b/event/src/main/java/com/zfoo/event/model/AppStartAfterEvent.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.event.model.event; +package com.zfoo.event.model; import org.springframework.context.ApplicationContext; import org.springframework.context.event.ApplicationContextEvent; diff --git a/event/src/main/java/com/zfoo/event/model/event/AppStartBeforeEvent.java b/event/src/main/java/com/zfoo/event/model/AppStartBeforeEvent.java similarity index 96% rename from event/src/main/java/com/zfoo/event/model/event/AppStartBeforeEvent.java rename to event/src/main/java/com/zfoo/event/model/AppStartBeforeEvent.java index c69d7886..8531370a 100644 --- a/event/src/main/java/com/zfoo/event/model/event/AppStartBeforeEvent.java +++ b/event/src/main/java/com/zfoo/event/model/AppStartBeforeEvent.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.event.model.event; +package com.zfoo.event.model; import org.springframework.context.ApplicationContext; import org.springframework.context.event.ApplicationContextEvent; diff --git a/event/src/main/java/com/zfoo/event/model/event/AppStartEvent.java b/event/src/main/java/com/zfoo/event/model/AppStartEvent.java similarity index 96% rename from event/src/main/java/com/zfoo/event/model/event/AppStartEvent.java rename to event/src/main/java/com/zfoo/event/model/AppStartEvent.java index f7589f99..46cd14f7 100644 --- a/event/src/main/java/com/zfoo/event/model/event/AppStartEvent.java +++ b/event/src/main/java/com/zfoo/event/model/AppStartEvent.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.event.model.event; +package com.zfoo.event.model; import org.springframework.context.ApplicationContext; import org.springframework.context.event.ApplicationContextEvent; diff --git a/event/src/main/java/com/zfoo/event/model/event/IEvent.java b/event/src/main/java/com/zfoo/event/model/IEvent.java similarity index 98% rename from event/src/main/java/com/zfoo/event/model/event/IEvent.java rename to event/src/main/java/com/zfoo/event/model/IEvent.java index eb9b33ba..f346e68e 100644 --- a/event/src/main/java/com/zfoo/event/model/event/IEvent.java +++ b/event/src/main/java/com/zfoo/event/model/IEvent.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.event.model.event; +package com.zfoo.event.model; import com.zfoo.protocol.util.RandomUtils; diff --git a/event/src/main/java/com/zfoo/event/schema/EventRegisterProcessor.java b/event/src/main/java/com/zfoo/event/schema/EventRegisterProcessor.java index 88a56219..85ce068a 100644 --- a/event/src/main/java/com/zfoo/event/schema/EventRegisterProcessor.java +++ b/event/src/main/java/com/zfoo/event/schema/EventRegisterProcessor.java @@ -13,15 +13,15 @@ package com.zfoo.event.schema; +import com.zfoo.event.anno.EventReceiver; +import com.zfoo.event.enhance.EnhanceUtils; +import com.zfoo.event.enhance.EventReceiverDefinition; import com.zfoo.event.manager.EventBus; -import com.zfoo.event.model.anno.EventReceiver; -import com.zfoo.event.model.event.IEvent; -import com.zfoo.event.model.vo.EnhanceUtils; -import com.zfoo.event.model.vo.EventReceiverDefinition; +import com.zfoo.event.model.IEvent; import com.zfoo.protocol.collection.ArrayUtils; +import com.zfoo.protocol.util.GraalVmUtils; import com.zfoo.protocol.util.ReflectionUtils; import com.zfoo.protocol.util.StringUtils; -import com.zfoo.protocol.util.GraalVmUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; diff --git a/event/src/test/java/com/zfoo/event/MyController1.java b/event/src/test/java/com/zfoo/event/MyController1.java index 61b67147..ca79fd0c 100644 --- a/event/src/test/java/com/zfoo/event/MyController1.java +++ b/event/src/test/java/com/zfoo/event/MyController1.java @@ -13,7 +13,7 @@ package com.zfoo.event; -import com.zfoo.event.model.anno.EventReceiver; +import com.zfoo.event.anno.EventReceiver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/event/src/test/java/com/zfoo/event/MyController2.java b/event/src/test/java/com/zfoo/event/MyController2.java index cbdf724f..4d43b2a1 100644 --- a/event/src/test/java/com/zfoo/event/MyController2.java +++ b/event/src/test/java/com/zfoo/event/MyController2.java @@ -13,8 +13,8 @@ package com.zfoo.event; -import com.zfoo.event.model.anno.Bus; -import com.zfoo.event.model.anno.EventReceiver; +import com.zfoo.event.anno.Bus; +import com.zfoo.event.anno.EventReceiver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/event/src/test/java/com/zfoo/event/MyNoticeEvent.java b/event/src/test/java/com/zfoo/event/MyNoticeEvent.java index 4db0bca0..08ec273d 100644 --- a/event/src/test/java/com/zfoo/event/MyNoticeEvent.java +++ b/event/src/test/java/com/zfoo/event/MyNoticeEvent.java @@ -13,7 +13,7 @@ package com.zfoo.event; -import com.zfoo.event.model.event.IEvent; +import com.zfoo.event.model.IEvent; /** * @author godotg diff --git a/net/src/main/java/com/zfoo/net/consumer/event/ConsumerStartEvent.java b/net/src/main/java/com/zfoo/net/consumer/event/ConsumerStartEvent.java index bedc3173..4de1e6b8 100644 --- a/net/src/main/java/com/zfoo/net/consumer/event/ConsumerStartEvent.java +++ b/net/src/main/java/com/zfoo/net/consumer/event/ConsumerStartEvent.java @@ -13,7 +13,7 @@ package com.zfoo.net.consumer.event; -import com.zfoo.event.model.event.IEvent; +import com.zfoo.event.model.IEvent; import com.zfoo.net.consumer.registry.RegisterVO; import com.zfoo.net.session.Session; diff --git a/net/src/main/java/com/zfoo/net/core/event/ClientSessionActiveEvent.java b/net/src/main/java/com/zfoo/net/core/event/ClientSessionActiveEvent.java index eb4d1980..17b86251 100644 --- a/net/src/main/java/com/zfoo/net/core/event/ClientSessionActiveEvent.java +++ b/net/src/main/java/com/zfoo/net/core/event/ClientSessionActiveEvent.java @@ -12,7 +12,7 @@ package com.zfoo.net.core.event; -import com.zfoo.event.model.event.IEvent; +import com.zfoo.event.model.IEvent; import com.zfoo.net.session.Session; /** diff --git a/net/src/main/java/com/zfoo/net/core/event/ClientSessionInactiveEvent.java b/net/src/main/java/com/zfoo/net/core/event/ClientSessionInactiveEvent.java index 33267489..82209254 100644 --- a/net/src/main/java/com/zfoo/net/core/event/ClientSessionInactiveEvent.java +++ b/net/src/main/java/com/zfoo/net/core/event/ClientSessionInactiveEvent.java @@ -12,7 +12,7 @@ package com.zfoo.net.core.event; -import com.zfoo.event.model.event.IEvent; +import com.zfoo.event.model.IEvent; import com.zfoo.net.session.Session; /** diff --git a/net/src/main/java/com/zfoo/net/core/event/ServerExceptionEvent.java b/net/src/main/java/com/zfoo/net/core/event/ServerExceptionEvent.java index e77ac97a..0f8cf049 100644 --- a/net/src/main/java/com/zfoo/net/core/event/ServerExceptionEvent.java +++ b/net/src/main/java/com/zfoo/net/core/event/ServerExceptionEvent.java @@ -12,7 +12,7 @@ package com.zfoo.net.core.event; -import com.zfoo.event.model.event.IEvent; +import com.zfoo.event.model.IEvent; import com.zfoo.net.router.attachment.IAttachment; import com.zfoo.net.session.Session; import com.zfoo.protocol.IPacket; diff --git a/net/src/main/java/com/zfoo/net/core/event/ServerSessionActiveEvent.java b/net/src/main/java/com/zfoo/net/core/event/ServerSessionActiveEvent.java index a4f4603a..018403e9 100644 --- a/net/src/main/java/com/zfoo/net/core/event/ServerSessionActiveEvent.java +++ b/net/src/main/java/com/zfoo/net/core/event/ServerSessionActiveEvent.java @@ -12,7 +12,7 @@ package com.zfoo.net.core.event; -import com.zfoo.event.model.event.IEvent; +import com.zfoo.event.model.IEvent; import com.zfoo.net.session.Session; /** diff --git a/net/src/main/java/com/zfoo/net/core/event/ServerSessionInactiveEvent.java b/net/src/main/java/com/zfoo/net/core/event/ServerSessionInactiveEvent.java index 13fd9016..18900447 100644 --- a/net/src/main/java/com/zfoo/net/core/event/ServerSessionInactiveEvent.java +++ b/net/src/main/java/com/zfoo/net/core/event/ServerSessionInactiveEvent.java @@ -12,7 +12,7 @@ package com.zfoo.net.core.event; -import com.zfoo.event.model.event.IEvent; +import com.zfoo.event.model.IEvent; import com.zfoo.net.session.Session; /** diff --git a/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayEvent.java b/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayEvent.java index 98754df1..c0f84dfa 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayEvent.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayEvent.java @@ -13,7 +13,7 @@ package com.zfoo.net.core.gateway.model; -import com.zfoo.event.model.event.IEvent; +import com.zfoo.event.model.IEvent; /** * @author godotg diff --git a/net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySessionInactiveEvent.java b/net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySessionInactiveEvent.java index 6af1d89d..163bb6b4 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySessionInactiveEvent.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySessionInactiveEvent.java @@ -13,7 +13,7 @@ package com.zfoo.net.core.gateway.model; -import com.zfoo.event.model.event.IEvent; +import com.zfoo.event.model.IEvent; /** * @author godotg