From c1222ed38c8bc1ba6499f96afbc73c01d525f0be Mon Sep 17 00:00:00 2001 From: "ding.lid" Date: Fri, 17 Feb 2012 14:26:17 +0000 Subject: [PATCH] =?UTF-8?q?@Default=E6=B3=A8=E8=A7=A3=E6=94=B9=E5=9B=9E@Ex?= =?UTF-8?q?tension=E6=B3=A8=E8=A7=A3=20-=20@Extension=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E6=A0=87=E7=A4=BADubbo=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=8C=BA=E5=88=86=E4=B8=80=E8=88=AC?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@986 1a56cb94-b969-4eaa-88fa-be21384802f2 --- .../alibaba/dubbo/rpc/cluster/Cluster.java | 4 +- .../dubbo/rpc/cluster/LoadBalance.java | 16 ++++---- .../com/alibaba/dubbo/rpc/cluster/Merger.java | 3 ++ .../dubbo/rpc/cluster/RouterFactory.java | 4 +- .../com/alibaba/dubbo/common/Adaptive.java | 5 +-- .../com/alibaba/dubbo/common/Default.java | 40 ------------------- .../com/alibaba/dubbo/common/Extension.java | 9 +---- .../alibaba/dubbo/common/ExtensionLoader.java | 4 +- .../dubbo/common/serialize/Serialization.java | 4 +- .../dubbo/common/status/StatusChecker.java | 3 ++ .../dubbo/common/threadpool/ThreadPool.java | 4 +- .../common/extensionloader/ext1/Ext1.java | 8 ++-- .../common/extensionloader/ext2/Ext2.java | 4 +- .../common/extensionloader/ext3/Ext3.java | 8 ++-- .../common/extensionloader/ext4/Ext4.java | 10 ++--- .../ext5/Ext5NoAdaptiveMethod.java | 6 +-- .../extensionloader/ext6_inject/Ext6.java | 4 +- .../common/extensionloader/ext7/Ext7.java | 2 + .../dubbo/config/support/MockProtocol.java | 15 ++++--- .../alibaba/dubbo/container/Container.java | 4 +- .../dubbo/container/page/PageHandler.java | 2 + .../alibaba/dubbo/monitor/MonitorFactory.java | 4 +- .../dubbo/registry/RegistryFactory.java | 4 +- .../dubbo/remoting/http/HttpBinder.java | 4 +- .../alibaba/dubbo/remoting/p2p/Networker.java | 2 + .../support/FileExchangeNetworker.java | 1 - .../dubbo/remoting/ChannelHandler.java | 5 ++- .../dubbo/remoting/ChannelHandlerWrapper.java | 12 +++--- .../com/alibaba/dubbo/remoting/Codec.java | 2 + .../alibaba/dubbo/remoting/Transporter.java | 12 +++--- .../dubbo/remoting/exchange/Exchanger.java | 4 +- .../dubbo/remoting/telnet/TelnetHandler.java | 2 + .../java/com/alibaba/dubbo/rpc/Filter.java | 3 ++ .../alibaba/dubbo/rpc/InvokerListener.java | 2 + .../java/com/alibaba/dubbo/rpc/Protocol.java | 8 ++-- .../com/alibaba/dubbo/rpc/ProxyFactory.java | 10 ++--- 36 files changed, 108 insertions(+), 126 deletions(-) delete mode 100644 dubbo-common/src/main/java/com/alibaba/dubbo/common/Default.java diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Cluster.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Cluster.java index a2d83bccf0..6abbb43fc8 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Cluster.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Cluster.java @@ -16,7 +16,7 @@ package com.alibaba.dubbo.rpc.cluster; import com.alibaba.dubbo.common.Adaptive; -import com.alibaba.dubbo.common.Default; +import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.cluster.support.FailoverCluster; @@ -29,7 +29,7 @@ import com.alibaba.dubbo.rpc.cluster.support.FailoverCluster; * * @author william.liangf */ -@Default(FailoverCluster.NAME) +@Extension(FailoverCluster.NAME) public interface Cluster { /** diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/LoadBalance.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/LoadBalance.java index 7866b99537..b3a43d8415 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/LoadBalance.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/LoadBalance.java @@ -15,13 +15,13 @@ */ package com.alibaba.dubbo.rpc.cluster; -import java.util.List; - -import com.alibaba.dubbo.common.Default; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.loadbalance.RandomLoadBalance; +import java.util.List; + +import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.rpc.Invocation; +import com.alibaba.dubbo.rpc.Invoker; +import com.alibaba.dubbo.rpc.RpcException; +import com.alibaba.dubbo.rpc.cluster.loadbalance.RandomLoadBalance; /** * LoadBalance. (SPI, Singleton, ThreadSafe) @@ -32,7 +32,7 @@ import com.alibaba.dubbo.rpc.cluster.loadbalance.RandomLoadBalance; * @author qian.lei * @author william.liangf */ -@Default(RandomLoadBalance.NAME) +@Extension(RandomLoadBalance.NAME) public interface LoadBalance { /** diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Merger.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Merger.java index 2e91903ab5..a0d50c1096 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Merger.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Merger.java @@ -15,9 +15,12 @@ */ package com.alibaba.dubbo.rpc.cluster; +import com.alibaba.dubbo.common.Extension; + /** * @author kimi */ +@Extension public interface Merger { T merge(T... items); diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/RouterFactory.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/RouterFactory.java index 69fb39b43e..495809a60d 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/RouterFactory.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/RouterFactory.java @@ -16,6 +16,7 @@ package com.alibaba.dubbo.rpc.cluster; import com.alibaba.dubbo.common.Adaptive; +import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.rpc.Invocation; @@ -27,7 +28,8 @@ import com.alibaba.dubbo.rpc.Invocation; * @see com.alibaba.dubbo.rpc.cluster.Cluster#join(Directory) * @see com.alibaba.dubbo.rpc.cluster.Directory#list(Invocation) * @author chao.liuc - */ + */ +@Extension public interface RouterFactory { /** diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Adaptive.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Adaptive.java index cc5f1e215e..c05933b660 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Adaptive.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Adaptive.java @@ -28,7 +28,6 @@ import java.lang.annotation.Target; * * @see ExtensionLoader * @see URL - * @see Default */ @Documented @Retention(RetentionPolicy.RUNTIME) @@ -38,7 +37,7 @@ public @interface Adaptive { /** * 从{@link URL}的Key名，对应的Value作为要Adapt成的Extension名。 *

- * 如果{@link URL}这些Key都没有Value，使用 用 缺省的扩展（在接口的{@link Default}中设定的值）。
+ * 如果{@link URL}这些Key都没有Value，使用 用 缺省的扩展（在接口的{@link Extension}中设定的值）。
* 比如，String[] {"key1", "key2"}，表示 *

    *
  1. 先在URL上找key1的Value作为要Adapt成的Extension名； @@ -50,7 +49,7 @@ public @interface Adaptive { * 如果不设置则缺省使用Extension接口类名的点分隔小写字串。
    * 即对于Extension接口{@code com.alibaba.dubbo.xxx.YyyInvokerWrapper}的缺省值为String[] {"yyy.invoker.wrapper"} * - * @see Default#value() + * @see Extension#value() */ String[] value() default {}; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Default.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Default.java deleted file mode 100644 index f2ac94feaa..0000000000 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Default.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 1999-2011 Alibaba Group. - * - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed 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.alibaba.dubbo.common; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * 扩展点缺省值声明 - * - * @author william.liangf - * @author ding.lid - */ -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE}) -public @interface Default { - - /** - * 扩展点缺省值 - */ - String value(); - -} \ No newline at end of file diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Extension.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Extension.java index d87c9648d6..770c5e12d3 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Extension.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Extension.java @@ -22,23 +22,18 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * 扩展点实现的元信息。 - * - * @deprecated 请在META-INF/services/配置文件中声明扩展点名称，如：fixed=com.xxx.FixedThreadPool + * 扩展点接口的标识。 * * @author william.liangf * @author ding.lid */ -@Deprecated @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) public @interface Extension { /** - * 扩展点名称。
    - * - * 如果注解在扩展的接口上，则缺省的扩展点。

    + * 缺省扩展点名。 */ String value() default ""; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/ExtensionLoader.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/ExtensionLoader.java index 6f97c278e5..8d3f77ea2d 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/ExtensionLoader.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/ExtensionLoader.java @@ -50,7 +50,6 @@ import com.alibaba.dubbo.common.utils.StringUtils; * @author william.liangf * @author ding.lid * - * @see Default * @see Adaptive */ public class ExtensionLoader { @@ -287,7 +286,7 @@ public class ExtensionLoader { } private Map> loadExtensionClasses() { - final Default defaultAnnotation = type.getAnnotation(Default.class); + final Extension defaultAnnotation = type.getAnnotation(Extension.class); if(defaultAnnotation != null) { String[] names = NAME_SEPARATOR.split(defaultAnnotation.value()); if(names.length > 1) { @@ -399,7 +398,6 @@ public class ExtensionLoader { return extensionClasses; } - @SuppressWarnings("deprecation") private String findAnnotationName(Class clazz) { Extension extension = clazz.getAnnotation(Extension.class); return extension == null ? null : extension.value(); diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/Serialization.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/Serialization.java index ad1102a234..e67b35dbd0 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/Serialization.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/Serialization.java @@ -20,7 +20,7 @@ import java.io.InputStream; import java.io.OutputStream; import com.alibaba.dubbo.common.Adaptive; -import com.alibaba.dubbo.common.Default; +import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; /** @@ -29,7 +29,7 @@ import com.alibaba.dubbo.common.URL; * @author ding.lid * @author william.liangf */ -@Default("hessian2") +@Extension("hessian2") public interface Serialization { /** diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/StatusChecker.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/StatusChecker.java index c8e4d4cb94..c97bad621c 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/StatusChecker.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/StatusChecker.java @@ -15,11 +15,14 @@ */ package com.alibaba.dubbo.common.status; +import com.alibaba.dubbo.common.Extension; + /** * StatusChecker * * @author william.liangf */ +@Extension public interface StatusChecker { /** diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/ThreadPool.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/ThreadPool.java index dae967d228..ceabd645c4 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/ThreadPool.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/ThreadPool.java @@ -19,7 +19,7 @@ import java.util.concurrent.Executor; import com.alibaba.dubbo.common.Adaptive; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Default; +import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; /** @@ -27,7 +27,7 @@ import com.alibaba.dubbo.common.URL; * * @author william.liangf */ -@Default("fixed") +@Extension("fixed") public interface ThreadPool { /** diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/Ext1.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/Ext1.java index 6bcefaaa1d..84daf79600 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/Ext1.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/Ext1.java @@ -15,14 +15,14 @@ */ package com.alibaba.dubbo.common.extensionloader.ext1; -import com.alibaba.dubbo.common.Adaptive; -import com.alibaba.dubbo.common.Default; -import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.Adaptive; +import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.URL; /** * @author ding.lid */ -@Default("impl1") +@Extension("impl1") public interface Ext1 { @Adaptive String echo(URL url, String s); diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/Ext2.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/Ext2.java index 9a29f2d236..d5cb33fd3d 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/Ext2.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/Ext2.java @@ -16,13 +16,15 @@ package com.alibaba.dubbo.common.extensionloader.ext2; import com.alibaba.dubbo.common.Adaptive; +import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; /** * 无Default * * @author ding.lid - */ + */ +@Extension public interface Ext2 { @Adaptive String echo(UrlHolder holder, String s); diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/Ext3.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/Ext3.java index 523d41d370..228c2da61b 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/Ext3.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/Ext3.java @@ -15,14 +15,14 @@ */ package com.alibaba.dubbo.common.extensionloader.ext3; -import com.alibaba.dubbo.common.Adaptive; -import com.alibaba.dubbo.common.Default; -import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.Adaptive; +import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.URL; /** * @author ding.lid */ -@Default("impl3") +@Extension("impl3") public interface Ext3 { @Adaptive({"key1", "protocol"}) String echo(URL url, String s); diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/Ext4.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/Ext4.java index f750c293ce..dad11eb8db 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/Ext4.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/Ext4.java @@ -15,15 +15,15 @@ */ package com.alibaba.dubbo.common.extensionloader.ext4; -import java.util.List; - -import com.alibaba.dubbo.common.Adaptive; -import com.alibaba.dubbo.common.Default; +import java.util.List; + +import com.alibaba.dubbo.common.Adaptive; +import com.alibaba.dubbo.common.Extension; /** * @author ding.lid */ -@Default("impl1") +@Extension("impl1") public interface Ext4 { @Adaptive String bark(String name, List list); // 没有URL参数的方法 diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/Ext5NoAdaptiveMethod.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/Ext5NoAdaptiveMethod.java index 77a372f8fd..0f07c49b8d 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/Ext5NoAdaptiveMethod.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/Ext5NoAdaptiveMethod.java @@ -15,13 +15,13 @@ */ package com.alibaba.dubbo.common.extensionloader.ext5; -import com.alibaba.dubbo.common.Default; -import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.URL; /** * @author ding.lid */ -@Default("impl1") +@Extension("impl1") public interface Ext5NoAdaptiveMethod { String echo(URL url, String s); diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/Ext6.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/Ext6.java index 5c3a2a4e45..1b4ba1b9d8 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/Ext6.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/Ext6.java @@ -16,13 +16,15 @@ package com.alibaba.dubbo.common.extensionloader.ext6_inject; import com.alibaba.dubbo.common.Adaptive; +import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; /** * 无Default * * @author ding.lid - */ + */ +@Extension public interface Ext6 { @Adaptive String echo(URL url, String s); diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/Ext7.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/Ext7.java index 487dfa8d2b..d7e1578460 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/Ext7.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/Ext7.java @@ -16,6 +16,7 @@ package com.alibaba.dubbo.common.extensionloader.ext7; import com.alibaba.dubbo.common.Adaptive; +import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; /** @@ -24,6 +25,7 @@ import com.alibaba.dubbo.common.URL; * * @author ding.lid */ +@Extension public interface Ext7 { @Adaptive String echo(URL url, String s); diff --git a/dubbo-config/src/test/java/com/alibaba/dubbo/config/support/MockProtocol.java b/dubbo-config/src/test/java/com/alibaba/dubbo/config/support/MockProtocol.java index 08d0646c86..332556b58b 100644 --- a/dubbo-config/src/test/java/com/alibaba/dubbo/config/support/MockProtocol.java +++ b/dubbo-config/src/test/java/com/alibaba/dubbo/config/support/MockProtocol.java @@ -15,14 +15,13 @@ */ package com.alibaba.dubbo.config.support; -import com.alibaba.dubbo.common.Default; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.rpc.Exporter; +import com.alibaba.dubbo.rpc.Invocation; +import com.alibaba.dubbo.rpc.Invoker; +import com.alibaba.dubbo.rpc.Protocol; +import com.alibaba.dubbo.rpc.Result; +import com.alibaba.dubbo.rpc.RpcException; /** * diff --git a/dubbo-container/src/main/java/com/alibaba/dubbo/container/Container.java b/dubbo-container/src/main/java/com/alibaba/dubbo/container/Container.java index 65d37168d9..f64c46a0a6 100644 --- a/dubbo-container/src/main/java/com/alibaba/dubbo/container/Container.java +++ b/dubbo-container/src/main/java/com/alibaba/dubbo/container/Container.java @@ -15,14 +15,14 @@ */ package com.alibaba.dubbo.container; -import com.alibaba.dubbo.common.Default; +import com.alibaba.dubbo.common.Extension; /** * Container. (SPI, Singleton, ThreadSafe) * * @author william.liangf */ -@Default("spring") +@Extension("spring") public interface Container { /** diff --git a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/PageHandler.java b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/PageHandler.java index f6cc1bfd31..582bce7e25 100644 --- a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/PageHandler.java +++ b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/PageHandler.java @@ -15,6 +15,7 @@ */ package com.alibaba.dubbo.container.page; +import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; /** @@ -22,6 +23,7 @@ import com.alibaba.dubbo.common.URL; * * @author william.liangf */ +@Extension public interface PageHandler { /** diff --git a/dubbo-monitor/src/main/java/com/alibaba/dubbo/monitor/MonitorFactory.java b/dubbo-monitor/src/main/java/com/alibaba/dubbo/monitor/MonitorFactory.java index c21f91e128..f072bf5afd 100644 --- a/dubbo-monitor/src/main/java/com/alibaba/dubbo/monitor/MonitorFactory.java +++ b/dubbo-monitor/src/main/java/com/alibaba/dubbo/monitor/MonitorFactory.java @@ -16,7 +16,7 @@ package com.alibaba.dubbo.monitor; import com.alibaba.dubbo.common.Adaptive; -import com.alibaba.dubbo.common.Default; +import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; /** @@ -24,7 +24,7 @@ import com.alibaba.dubbo.common.URL; * * @author william.liangf */ -@Default("dubbo") +@Extension("dubbo") public interface MonitorFactory { /** diff --git a/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/RegistryFactory.java b/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/RegistryFactory.java index 963d34fe92..2ab1105e31 100644 --- a/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/RegistryFactory.java +++ b/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/RegistryFactory.java @@ -16,7 +16,7 @@ package com.alibaba.dubbo.registry; import com.alibaba.dubbo.common.Adaptive; -import com.alibaba.dubbo.common.Default; +import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; /** @@ -27,7 +27,7 @@ import com.alibaba.dubbo.common.URL; * @see com.alibaba.dubbo.registry.support.AbstractRegistryFactory * @author william.liangf */ -@Default("dubbo") +@Extension("dubbo") public interface RegistryFactory { /** diff --git a/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/HttpBinder.java b/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/HttpBinder.java index 4d2ad707cf..a7356bbb5c 100644 --- a/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/HttpBinder.java +++ b/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/HttpBinder.java @@ -17,7 +17,7 @@ package com.alibaba.dubbo.remoting.http; import com.alibaba.dubbo.common.Adaptive; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Default; +import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; /** @@ -25,7 +25,7 @@ import com.alibaba.dubbo.common.URL; * * @author william.liangf */ -@Default("jetty") +@Extension("jetty") public interface HttpBinder { /** diff --git a/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/Networker.java b/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/Networker.java index ea55d135ea..c7fafe16c7 100644 --- a/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/Networker.java +++ b/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/Networker.java @@ -15,6 +15,7 @@ */ package com.alibaba.dubbo.remoting.p2p; +import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.RemotingException; @@ -25,6 +26,7 @@ import com.alibaba.dubbo.remoting.RemotingException; * * @author william.liangf */ +@Extension public interface Networker { /** diff --git a/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/FileExchangeNetworker.java b/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/FileExchangeNetworker.java index 256732c2bc..85d7a1b0fb 100644 --- a/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/FileExchangeNetworker.java +++ b/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/FileExchangeNetworker.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.remoting.p2p.exchange.support; -import com.alibaba.dubbo.common.Default; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.RemotingException; import com.alibaba.dubbo.remoting.p2p.exchange.ExchangeGroup; diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/ChannelHandler.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/ChannelHandler.java index 1b0d81481e..0f789bd540 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/ChannelHandler.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/ChannelHandler.java @@ -14,6 +14,8 @@ * limitations under the License. */ package com.alibaba.dubbo.remoting; + +import com.alibaba.dubbo.common.Extension; /** @@ -23,7 +25,8 @@ package com.alibaba.dubbo.remoting; * @see com.alibaba.dubbo.remoting.Transporter#connect(com.alibaba.dubbo.common.URL, ChannelHandler) * @author qian.lei * @author william.liangf - */ + */ +@Extension public interface ChannelHandler { /** diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/ChannelHandlerWrapper.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/ChannelHandlerWrapper.java index 148c79a2b9..1addb27274 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/ChannelHandlerWrapper.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/ChannelHandlerWrapper.java @@ -15,18 +15,18 @@ */ package com.alibaba.dubbo.remoting; -import com.alibaba.dubbo.common.Adaptive; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Default; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.transport.handler.DefaultChannelHandlerWrapper; +import com.alibaba.dubbo.common.Adaptive; +import com.alibaba.dubbo.common.Constants; +import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.remoting.transport.handler.DefaultChannelHandlerWrapper; /** * ChannelHandlerWrapper (SPI, Singleton, ThreadSafe) * * @author chao.liuc */ -@Default(DefaultChannelHandlerWrapper.NAME) +@Extension(DefaultChannelHandlerWrapper.NAME) public interface ChannelHandlerWrapper { /** diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Codec.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Codec.java index 49b06c3476..495738a96d 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Codec.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Codec.java @@ -21,6 +21,7 @@ import java.io.OutputStream; import com.alibaba.dubbo.common.Adaptive; import com.alibaba.dubbo.common.Constants; +import com.alibaba.dubbo.common.Extension; /** * Codec. (SPI, Singleton, ThreadSafe) @@ -29,6 +30,7 @@ import com.alibaba.dubbo.common.Constants; * @author ding.lid * @author william.liangf */ +@Extension public interface Codec { /** diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Transporter.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Transporter.java index 9d8e980367..1f66d42c28 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Transporter.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Transporter.java @@ -15,10 +15,12 @@ */ package com.alibaba.dubbo.remoting; -import com.alibaba.dubbo.common.Adaptive; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Default; -import com.alibaba.dubbo.common.URL; +import javax.sound.midi.Receiver; + +import com.alibaba.dubbo.common.Adaptive; +import com.alibaba.dubbo.common.Constants; +import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.URL; /** * Transporter. (SPI, Singleton, ThreadSafe) @@ -30,7 +32,7 @@ import com.alibaba.dubbo.common.URL; * @author ding.lid * @author william.liangf */ -@Default("netty") +@Extension("netty") public interface Transporter { /** diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/Exchanger.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/Exchanger.java index 02afb2344d..10ab3ed10a 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/Exchanger.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/Exchanger.java @@ -17,7 +17,7 @@ package com.alibaba.dubbo.remoting.exchange; import com.alibaba.dubbo.common.Adaptive; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Default; +import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.RemotingException; import com.alibaba.dubbo.remoting.exchange.support.header.HeaderExchanger; @@ -30,7 +30,7 @@ import com.alibaba.dubbo.remoting.exchange.support.header.HeaderExchanger; * * @author william.liangf */ -@Default(HeaderExchanger.NAME) +@Extension(HeaderExchanger.NAME) public interface Exchanger { /** diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/TelnetHandler.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/TelnetHandler.java index f1ab3eecea..cca6c56145 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/TelnetHandler.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/TelnetHandler.java @@ -15,6 +15,7 @@ */ package com.alibaba.dubbo.remoting.telnet; +import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.remoting.Channel; import com.alibaba.dubbo.remoting.RemotingException; @@ -23,6 +24,7 @@ import com.alibaba.dubbo.remoting.RemotingException; * * @author william.liangf */ +@Extension public interface TelnetHandler { /** diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/Filter.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/Filter.java index 229826a49e..8f1ac372f2 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/Filter.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/Filter.java @@ -15,12 +15,15 @@ */ package com.alibaba.dubbo.rpc; +import com.alibaba.dubbo.common.Extension; + /** * Filter. (SPI, Singleton, ThreadSafe) * * @author william.liangf */ +@Extension public interface Filter { /** diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/InvokerListener.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/InvokerListener.java index 61075cdbf9..2be31ce45e 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/InvokerListener.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/InvokerListener.java @@ -15,6 +15,7 @@ */ package com.alibaba.dubbo.rpc; +import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; /** @@ -22,6 +23,7 @@ import com.alibaba.dubbo.common.URL; * * @author william.liangf */ +@Extension public interface InvokerListener { /** diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/Protocol.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/Protocol.java index b8ed9c14ee..ecfbb33434 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/Protocol.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/Protocol.java @@ -15,16 +15,16 @@ */ package com.alibaba.dubbo.rpc; -import com.alibaba.dubbo.common.Adaptive; -import com.alibaba.dubbo.common.Default; -import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.Adaptive; +import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.URL; /** * Protocol. (SPI, Singleton, ThreadSafe) * * @author william.liangf */ -@Default("dubbo") +@Extension("dubbo") public interface Protocol { /** diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/ProxyFactory.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/ProxyFactory.java index b0a3e128bb..a0b8fc7188 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/ProxyFactory.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/ProxyFactory.java @@ -15,17 +15,17 @@ */ package com.alibaba.dubbo.rpc; -import com.alibaba.dubbo.common.Adaptive; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Default; -import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.Adaptive; +import com.alibaba.dubbo.common.Constants; +import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.URL; /** * ProxyFactory. (SPI, Singleton, ThreadSafe) * * @author william.liangf */ -@Default("javassist") +@Extension("javassist") public interface ProxyFactory { /**