From 220aa6d289a23f97b955242bc7b34e9f977689fc Mon Sep 17 00:00:00 2001 From: liangfei0201 Date: Wed, 15 Aug 2012 19:12:52 +0800 Subject: [PATCH] =?UTF-8?q?DUBBO-568=20-=20=E9=85=8D=E7=BD=AE=E9=A1=B9disp?= =?UTF-8?q?ather=E5=8D=95=E8=AF=8D=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/alibaba/dubbo/remoting/Dispatcher.java | 6 +++--- .../dubbo/remoting/transport/AbstractClient.java | 2 +- .../dubbo/remoting/transport/AbstractServer.java | 2 +- .../ChannelEventRunnable.java | 2 +- .../{dispather => dispatcher}/ChannelHandlers.java | 4 ++-- .../WrappedChannelHandler.java | 2 +- .../all/AllChannelHandler.java | 8 ++++---- .../{dispather => dispatcher}/all/AllDispather.java | 4 ++-- .../connection/ConnectionOrderedChannelHandler.java | 8 ++++---- .../connection/ConnectionOrderedDispather.java | 4 ++-- .../direct/DirectDispather.java | 4 ++-- .../execution/ExecutionChannelHandler.java | 8 ++++---- .../execution/ExecutionDispather.java | 4 ++-- .../message/MessageOnlyChannelHandler.java | 8 ++++---- .../message/MessageOnlyDispather.java | 4 ++-- .../internal/com.alibaba.dubbo.remoting.Dispatcher | 10 +++++----- .../alibaba/dubbo/remoting/PerformanceServerTest.java | 2 +- .../remoting/handler/ConnectChannelHandlerTest.java | 2 +- .../remoting/handler/WrappedChannelHandlerTest.java | 2 +- .../dubbo/remoting/transport/mina/MinaServer.java | 2 +- .../dubbo/remoting/transport/netty/NettyServer.java | 2 +- .../transport/dispather/FakeChannelHandlers.java | 3 ++- 22 files changed, 47 insertions(+), 46 deletions(-) rename dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/{dispather => dispatcher}/ChannelEventRunnable.java (95%) rename dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/{dispather => dispatcher}/ChannelHandlers.java (95%) rename dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/{dispather => dispatcher}/WrappedChannelHandler.java (98%) rename dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/{dispather => dispatcher}/all/AllChannelHandler.java (90%) rename dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/{dispather => dispatcher}/all/AllDispather.java (86%) rename dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/{dispather => dispatcher}/connection/ConnectionOrderedChannelHandler.java (93%) rename dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/{dispather => dispatcher}/connection/ConnectionOrderedDispather.java (86%) rename dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/{dispather => dispatcher}/direct/DirectDispather.java (86%) rename dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/{dispather => dispatcher}/execution/ExecutionChannelHandler.java (84%) rename dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/{dispather => dispatcher}/execution/ExecutionDispather.java (86%) rename dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/{dispather => dispatcher}/message/MessageOnlyChannelHandler.java (83%) rename dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/{dispather => dispatcher}/message/MessageOnlyDispather.java (86%) diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Dispatcher.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Dispatcher.java index d8da98ef99c..92228f3e0f7 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Dispatcher.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Dispatcher.java @@ -19,7 +19,7 @@ import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.extension.Adaptive; import com.alibaba.dubbo.common.extension.SPI; -import com.alibaba.dubbo.remoting.transport.dispather.all.AllDispather; +import com.alibaba.dubbo.remoting.transport.dispatcher.all.AllDispather; /** * ChannelHandlerWrapper (SPI, Singleton, ThreadSafe) @@ -30,13 +30,13 @@ public interface Dispatcher { /** - * dispath. + * dispatch the message to threadpool. * * @param handler * @param url * @return channel handler */ @Adaptive({Constants.DISPATCHER_KEY, "dispather", "channel.handler"}) // 后两个参数为兼容旧配置 - ChannelHandler dispath(ChannelHandler handler, URL url); + ChannelHandler dispatch(ChannelHandler handler, URL url); } \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractClient.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractClient.java index 79f69506736..8bbd54662d9 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractClient.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractClient.java @@ -40,7 +40,7 @@ import com.alibaba.dubbo.remoting.ChannelHandler; import com.alibaba.dubbo.remoting.Client; import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.dispather.ChannelHandlers; +import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelHandlers; /** * AbstractClient diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractServer.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractServer.java index 8fa514f6777..7ab2871c2ed 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractServer.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractServer.java @@ -30,7 +30,7 @@ import com.alibaba.dubbo.remoting.ChannelHandler; import com.alibaba.dubbo.remoting.RemotingException; import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.transport.dispather.WrappedChannelHandler; +import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler; /** * AbstractServer diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/ChannelEventRunnable.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/ChannelEventRunnable.java similarity index 95% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/ChannelEventRunnable.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/ChannelEventRunnable.java index 79344433df6..f0976d34f63 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/ChannelEventRunnable.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/ChannelEventRunnable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispather; +package com.alibaba.dubbo.remoting.transport.dispatcher; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/ChannelHandlers.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/ChannelHandlers.java similarity index 95% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/ChannelHandlers.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/ChannelHandlers.java index 2458d091088..5590d7b543b 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/ChannelHandlers.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/ChannelHandlers.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispather; +package com.alibaba.dubbo.remoting.transport.dispatcher; import com.alibaba.dubbo.common.URL; @@ -37,7 +37,7 @@ protected ChannelHandlers() {} protected ChannelHandler wrapInternal(ChannelHandler handler, URL url) { return new MultiMessageHandler(new HeartbeatHandler(ExtensionLoader.getExtensionLoader(Dispatcher.class) - .getAdaptiveExtension().dispath(handler, url))); + .getAdaptiveExtension().dispatch(handler, url))); } private static ChannelHandlers INSTANCE = new ChannelHandlers(); diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/WrappedChannelHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/WrappedChannelHandler.java similarity index 98% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/WrappedChannelHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/WrappedChannelHandler.java index ccaba8c6a2a..4ba418f9c50 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/WrappedChannelHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/WrappedChannelHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispather; +package com.alibaba.dubbo.remoting.transport.dispatcher; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/all/AllChannelHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/all/AllChannelHandler.java similarity index 90% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/all/AllChannelHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/all/AllChannelHandler.java index 6103e951cc8..1268cdb1418 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/all/AllChannelHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/all/AllChannelHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispather.all; +package com.alibaba.dubbo.remoting.transport.dispatcher.all; import java.util.concurrent.ExecutorService; @@ -22,9 +22,9 @@ import com.alibaba.dubbo.remoting.ChannelHandler; import com.alibaba.dubbo.remoting.ExecutionException; import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.dispather.ChannelEventRunnable; -import com.alibaba.dubbo.remoting.transport.dispather.ChannelEventRunnable.ChannelState; -import com.alibaba.dubbo.remoting.transport.dispather.WrappedChannelHandler; +import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable; +import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler; +import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable.ChannelState; public class AllChannelHandler extends WrappedChannelHandler { diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/all/AllDispather.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/all/AllDispather.java similarity index 86% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/all/AllDispather.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/all/AllDispather.java index b3b3d1387b3..c6be973d0c2 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/all/AllDispather.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/all/AllDispather.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispather.all; +package com.alibaba.dubbo.remoting.transport.dispatcher.all; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.ChannelHandler; @@ -28,7 +28,7 @@ public class AllDispather implements Dispatcher { public static final String NAME = "all"; - public ChannelHandler dispath(ChannelHandler handler, URL url) { + public ChannelHandler dispatch(ChannelHandler handler, URL url) { return new AllChannelHandler(handler, url); } diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/connection/ConnectionOrderedChannelHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedChannelHandler.java similarity index 93% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/connection/ConnectionOrderedChannelHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedChannelHandler.java index 5b72097635e..4dff6d5a3d1 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/connection/ConnectionOrderedChannelHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedChannelHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispather.connection; +package com.alibaba.dubbo.remoting.transport.dispatcher.connection; import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; @@ -28,9 +28,9 @@ import com.alibaba.dubbo.remoting.ChannelHandler; import com.alibaba.dubbo.remoting.ExecutionException; import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.dispather.ChannelEventRunnable; -import com.alibaba.dubbo.remoting.transport.dispather.ChannelEventRunnable.ChannelState; -import com.alibaba.dubbo.remoting.transport.dispather.WrappedChannelHandler; +import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable; +import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler; +import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable.ChannelState; public class ConnectionOrderedChannelHandler extends WrappedChannelHandler { diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/connection/ConnectionOrderedDispather.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedDispather.java similarity index 86% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/connection/ConnectionOrderedDispather.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedDispather.java index 766126ebbae..2b8b55ad57e 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/connection/ConnectionOrderedDispather.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedDispather.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispather.connection; +package com.alibaba.dubbo.remoting.transport.dispatcher.connection; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.ChannelHandler; @@ -28,7 +28,7 @@ public class ConnectionOrderedDispather implements Dispatcher { public static final String NAME = "connection"; - public ChannelHandler dispath(ChannelHandler handler, URL url) { + public ChannelHandler dispatch(ChannelHandler handler, URL url) { return new ConnectionOrderedChannelHandler(handler, url); } diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/direct/DirectDispather.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/direct/DirectDispather.java similarity index 86% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/direct/DirectDispather.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/direct/DirectDispather.java index 54231e6acda..bb141a4de44 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/direct/DirectDispather.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/direct/DirectDispather.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispather.direct; +package com.alibaba.dubbo.remoting.transport.dispatcher.direct; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.ChannelHandler; @@ -28,7 +28,7 @@ public class DirectDispather implements Dispatcher { public static final String NAME = "direct"; - public ChannelHandler dispath(ChannelHandler handler, URL url) { + public ChannelHandler dispatch(ChannelHandler handler, URL url) { return handler; } diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/execution/ExecutionChannelHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/execution/ExecutionChannelHandler.java similarity index 84% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/execution/ExecutionChannelHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/execution/ExecutionChannelHandler.java index 48334c386d7..ffe113a87ac 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/execution/ExecutionChannelHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/execution/ExecutionChannelHandler.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispather.execution; +package com.alibaba.dubbo.remoting.transport.dispatcher.execution; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.Channel; import com.alibaba.dubbo.remoting.ChannelHandler; import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.dispather.ChannelEventRunnable; -import com.alibaba.dubbo.remoting.transport.dispather.ChannelEventRunnable.ChannelState; -import com.alibaba.dubbo.remoting.transport.dispather.WrappedChannelHandler; +import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable; +import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler; +import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable.ChannelState; public class ExecutionChannelHandler extends WrappedChannelHandler { diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/execution/ExecutionDispather.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/execution/ExecutionDispather.java similarity index 86% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/execution/ExecutionDispather.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/execution/ExecutionDispather.java index 0d80a78bd20..36e86c91f7b 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/execution/ExecutionDispather.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/execution/ExecutionDispather.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispather.execution; +package com.alibaba.dubbo.remoting.transport.dispatcher.execution; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.ChannelHandler; @@ -28,7 +28,7 @@ public class ExecutionDispather implements Dispatcher { public static final String NAME = "execution"; - public ChannelHandler dispath(ChannelHandler handler, URL url) { + public ChannelHandler dispatch(ChannelHandler handler, URL url) { return new ExecutionChannelHandler(handler, url); } diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/message/MessageOnlyChannelHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/message/MessageOnlyChannelHandler.java similarity index 83% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/message/MessageOnlyChannelHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/message/MessageOnlyChannelHandler.java index 7af07a2fb4e..19a112970f2 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/message/MessageOnlyChannelHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/message/MessageOnlyChannelHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispather.message; +package com.alibaba.dubbo.remoting.transport.dispatcher.message; import java.util.concurrent.ExecutorService; @@ -22,9 +22,9 @@ import com.alibaba.dubbo.remoting.ChannelHandler; import com.alibaba.dubbo.remoting.ExecutionException; import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.dispather.ChannelEventRunnable; -import com.alibaba.dubbo.remoting.transport.dispather.ChannelEventRunnable.ChannelState; -import com.alibaba.dubbo.remoting.transport.dispather.WrappedChannelHandler; +import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable; +import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler; +import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable.ChannelState; public class MessageOnlyChannelHandler extends WrappedChannelHandler { diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/message/MessageOnlyDispather.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/message/MessageOnlyDispather.java similarity index 86% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/message/MessageOnlyDispather.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/message/MessageOnlyDispather.java index d41e3dd25d5..b00db8995a3 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/message/MessageOnlyDispather.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/message/MessageOnlyDispather.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispather.message; +package com.alibaba.dubbo.remoting.transport.dispatcher.message; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.ChannelHandler; @@ -28,7 +28,7 @@ public class MessageOnlyDispather implements Dispatcher { public static final String NAME = "message"; - public ChannelHandler dispath(ChannelHandler handler, URL url) { + public ChannelHandler dispatch(ChannelHandler handler, URL url) { return new MessageOnlyChannelHandler(handler, url); } diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Dispatcher b/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Dispatcher index 3eeb5d95020..f4e57692289 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Dispatcher +++ b/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Dispatcher @@ -1,5 +1,5 @@ -all=com.alibaba.dubbo.remoting.transport.dispather.all.AllDispather -direct=com.alibaba.dubbo.remoting.transport.dispather.direct.DirectDispather -message=com.alibaba.dubbo.remoting.transport.dispather.message.MessageOnlyDispather -execution=com.alibaba.dubbo.remoting.transport.dispather.execution.ExecutionDispather -connection=com.alibaba.dubbo.remoting.transport.dispather.connection.ConnectionOrderedDispather \ No newline at end of file +all=com.alibaba.dubbo.remoting.transport.dispatcher.all.AllDispather +direct=com.alibaba.dubbo.remoting.transport.dispatcher.direct.DirectDispather +message=com.alibaba.dubbo.remoting.transport.dispatcher.message.MessageOnlyDispather +execution=com.alibaba.dubbo.remoting.transport.dispatcher.execution.ExecutionDispather +connection=com.alibaba.dubbo.remoting.transport.dispatcher.connection.ConnectionOrderedDispather \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceServerTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceServerTest.java index 4a17bac9732..0654f813ed5 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceServerTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceServerTest.java @@ -29,7 +29,7 @@ import com.alibaba.dubbo.remoting.exchange.ExchangeServer; import com.alibaba.dubbo.remoting.exchange.Exchangers; import com.alibaba.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; -import com.alibaba.dubbo.remoting.transport.dispather.execution.ExecutionDispather; +import com.alibaba.dubbo.remoting.transport.dispatcher.execution.ExecutionDispather; /** * PerformanceServer diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/ConnectChannelHandlerTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/ConnectChannelHandlerTest.java index fae3dc832f4..3155ecb50d9 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/ConnectChannelHandlerTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/ConnectChannelHandlerTest.java @@ -28,7 +28,7 @@ import com.alibaba.dubbo.remoting.RemotingException; import com.alibaba.dubbo.remoting.exchange.Request; import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.transport.dispather.connection.ConnectionOrderedChannelHandler; +import com.alibaba.dubbo.remoting.transport.dispatcher.connection.ConnectionOrderedChannelHandler; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/WrappedChannelHandlerTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/WrappedChannelHandlerTest.java index dc981a49094..b086bf35377 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/WrappedChannelHandlerTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/WrappedChannelHandlerTest.java @@ -28,7 +28,7 @@ import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.Channel; import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.dispather.WrappedChannelHandler; +import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler; public class WrappedChannelHandlerTest { WrappedChannelHandler handler ; diff --git a/dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaServer.java b/dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaServer.java index 8bcd0f82d3e..b0191c6d50a 100644 --- a/dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaServer.java +++ b/dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaServer.java @@ -37,7 +37,7 @@ import com.alibaba.dubbo.remoting.ChannelHandler; import com.alibaba.dubbo.remoting.RemotingException; import com.alibaba.dubbo.remoting.transport.AbstractServer; -import com.alibaba.dubbo.remoting.transport.dispather.ChannelHandlers; +import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelHandlers; /** * MinaServer diff --git a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyServer.java b/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyServer.java index 30956b10eab..af006355f9d 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyServer.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyServer.java @@ -41,7 +41,7 @@ import com.alibaba.dubbo.remoting.RemotingException; import com.alibaba.dubbo.remoting.Server; import com.alibaba.dubbo.remoting.transport.AbstractServer; -import com.alibaba.dubbo.remoting.transport.dispather.ChannelHandlers; +import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelHandlers; /** * NettyServer diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/dispather/FakeChannelHandlers.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/dispather/FakeChannelHandlers.java index 6fc14f3977b..dc91e033e14 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/dispather/FakeChannelHandlers.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/dispather/FakeChannelHandlers.java @@ -20,6 +20,7 @@ import com.alibaba.dubbo.common.extension.ExtensionLoader; import com.alibaba.dubbo.remoting.ChannelHandler; import com.alibaba.dubbo.remoting.Dispatcher; +import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelHandlers; /** * @author kimi @@ -33,7 +34,7 @@ public FakeChannelHandlers() { @Override protected ChannelHandler wrapInternal(ChannelHandler handler, URL url) { return ExtensionLoader.getExtensionLoader(Dispatcher.class) - .getAdaptiveExtension().dispath(handler, url); + .getAdaptiveExtension().dispatch(handler, url); } public static void setTestingChannelHandlers() {