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 6abbb43fc8..a2d83bccf0 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.Extension; +import com.alibaba.dubbo.common.Default; 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 */ -@Extension(FailoverCluster.NAME) +@Default(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 5ccd74addb..7866b99537 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 @@ -17,7 +17,7 @@ package com.alibaba.dubbo.rpc.cluster; import java.util.List; -import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.Default; import com.alibaba.dubbo.rpc.Invocation; import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.RpcException; @@ -32,7 +32,7 @@ import com.alibaba.dubbo.rpc.cluster.loadbalance.RandomLoadBalance; * @author qian.lei * @author william.liangf */ -@Extension(RandomLoadBalance.NAME) +@Default(RandomLoadBalance.NAME) public interface LoadBalance { /** 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 cdb95dbb77..152d97e021 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,7 +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.Default; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.rpc.Invocation; @@ -29,7 +29,7 @@ import com.alibaba.dubbo.rpc.Invocation; * @see com.alibaba.dubbo.rpc.cluster.Directory#list(Invocation) * @author chao.liuc */ -@Extension +@Default public interface RouterFactory { /** diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java index 6123071896..c75713796d 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java @@ -19,17 +19,15 @@ import java.util.List; import java.util.Random; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.rpc.Invocation; import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.RpcStatus; -import com.alibaba.dubbo.rpc.Invocation; /** * LeastActiveLoadBalance * * @author william.liangf */ -@Extension(LeastActiveLoadBalance.NAME) public class LeastActiveLoadBalance extends AbstractLoadBalance { public static final String NAME = "leastactive"; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RandomLoadBalance.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RandomLoadBalance.java index a86c5f7210..aadf7bbeab 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RandomLoadBalance.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RandomLoadBalance.java @@ -15,12 +15,11 @@ */ package com.alibaba.dubbo.rpc.cluster.loadbalance; -import java.util.List; -import java.util.Random; - -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Invocation; +import java.util.List; +import java.util.Random; + +import com.alibaba.dubbo.rpc.Invocation; +import com.alibaba.dubbo.rpc.Invoker; /** * random load balance. @@ -28,7 +27,6 @@ import com.alibaba.dubbo.rpc.Invocation; * @author qianlei * @author william.liangf */ -@Extension(RandomLoadBalance.NAME) public class RandomLoadBalance extends AbstractLoadBalance { public static final String NAME = "random"; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java index a8aaec6841..47fdbd47ba 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java @@ -15,14 +15,13 @@ */ package com.alibaba.dubbo.rpc.cluster.loadbalance; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.utils.AtomicPositiveInteger; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Invocation; +import java.util.List; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +import com.alibaba.dubbo.common.utils.AtomicPositiveInteger; +import com.alibaba.dubbo.rpc.Invocation; +import com.alibaba.dubbo.rpc.Invoker; /** * Round robin load balance. @@ -30,7 +29,6 @@ import com.alibaba.dubbo.rpc.Invocation; * @author qian.lei * @author william.liangf */ -@Extension(RoundRobinLoadBalance.NAME) public class RoundRobinLoadBalance extends AbstractLoadBalance { public static final String NAME = "roundrobin"; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/ArrayMerger.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/ArrayMerger.java index 1f3c41689e..711176a1e6 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/ArrayMerger.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/ArrayMerger.java @@ -15,15 +15,13 @@ */ package com.alibaba.dubbo.rpc.cluster.merger; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.rpc.cluster.Merger; - import java.lang.reflect.Array; +import com.alibaba.dubbo.rpc.cluster.Merger; + /** * @author kimi */ -@Extension( ArrayMerger.NAME ) public class ArrayMerger implements Merger { public static final String NAME = "array"; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/CollectionMerger.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/CollectionMerger.java index 82f2dba528..40f240204f 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/CollectionMerger.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/CollectionMerger.java @@ -15,9 +15,6 @@ */ package com.alibaba.dubbo.rpc.cluster.merger; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.rpc.cluster.Merger; - import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -25,10 +22,11 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import com.alibaba.dubbo.rpc.cluster.Merger; + /** * @author kimi */ -@Extension( CollectionMerger.NAME ) public class CollectionMerger implements Merger> { public static final String NAME = "collection"; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/MapMerger.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/MapMerger.java index ffd5eabd13..2b35eaaa83 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/MapMerger.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/MapMerger.java @@ -15,16 +15,14 @@ */ package com.alibaba.dubbo.rpc.cluster.merger; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.rpc.cluster.Merger; - import java.util.HashMap; import java.util.Map; +import com.alibaba.dubbo.rpc.cluster.Merger; + /** * @author kimi */ -@Extension( MapMerger.NAME ) public class MapMerger implements Merger> { public static final String NAME = "map"; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/FileRouterFactory.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/FileRouterFactory.java index aee5f547e6..994dc179ea 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/FileRouterFactory.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/FileRouterFactory.java @@ -15,18 +15,16 @@ */ package com.alibaba.dubbo.rpc.cluster.router; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; + +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.utils.IOUtils; +import com.alibaba.dubbo.rpc.RpcConstants; +import com.alibaba.dubbo.rpc.cluster.Router; +import com.alibaba.dubbo.rpc.cluster.RouterFactory; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.IOUtils; -import com.alibaba.dubbo.rpc.RpcConstants; -import com.alibaba.dubbo.rpc.cluster.Router; -import com.alibaba.dubbo.rpc.cluster.RouterFactory; - -@Extension(FileRouterFactory.NAME) public class FileRouterFactory implements RouterFactory { public static final String NAME = "file"; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/ScriptRouterFactory.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/ScriptRouterFactory.java index 43edc39e34..6f4b70db72 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/ScriptRouterFactory.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/ScriptRouterFactory.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.rpc.cluster.router; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.rpc.cluster.Router; import com.alibaba.dubbo.rpc.cluster.RouterFactory; @@ -34,7 +33,6 @@ import com.alibaba.dubbo.rpc.cluster.RouterFactory; * * @author william.liangf */ -@Extension(ScriptRouterFactory.NAME) public class ScriptRouterFactory implements RouterFactory { public static final String NAME = "script"; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/AvailableCluster.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/AvailableCluster.java index da0f4abc90..7b0de21b21 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/AvailableCluster.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/AvailableCluster.java @@ -17,11 +17,10 @@ package com.alibaba.dubbo.rpc.cluster.support; import java.util.List; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.Invocation; +import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.Result; +import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.cluster.Cluster; import com.alibaba.dubbo.rpc.cluster.Directory; import com.alibaba.dubbo.rpc.cluster.LoadBalance; @@ -31,7 +30,6 @@ import com.alibaba.dubbo.rpc.cluster.LoadBalance; * * @author william.liangf */ -@Extension(AvailableCluster.NAME) public class AvailableCluster implements Cluster { public static final String NAME = "available"; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailbackCluster.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailbackCluster.java index fc7b30db44..ac2874648c 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailbackCluster.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailbackCluster.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.cluster.Cluster; @@ -28,7 +27,6 @@ import com.alibaba.dubbo.rpc.cluster.Directory; * * @author william.liangf */ -@Extension(FailbackCluster.NAME) public class FailbackCluster implements Cluster { public final static String NAME = "failback"; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailfastCluster.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailfastCluster.java index 99c8883cf4..4f39e256d6 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailfastCluster.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailfastCluster.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.cluster.Cluster; @@ -28,7 +27,6 @@ import com.alibaba.dubbo.rpc.cluster.Directory; * * @author william.liangf */ -@Extension(FailfastCluster.NAME) public class FailfastCluster implements Cluster { public final static String NAME = "failfast"; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailfastClusterInvoker.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailfastClusterInvoker.java index cf7c42a9e8..b1d9e01956 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailfastClusterInvoker.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailfastClusterInvoker.java @@ -17,7 +17,6 @@ package com.alibaba.dubbo.rpc.cluster.support; import java.util.List; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.Version; import com.alibaba.dubbo.common.utils.NetUtils; import com.alibaba.dubbo.rpc.Invocation; @@ -50,7 +49,7 @@ public class FailfastClusterInvoker extends AbstractClusterInvoker{ if (e instanceof RpcException && ((RpcException)e).isBiz()) { // biz exception. throw (RpcException) e; } - throw new RpcException(e instanceof RpcException ? ((RpcException)e).getCode() : 0, "Failfast invoke providers " + invoker.getUrl() + " " + loadbalance.getClass().getAnnotation(Extension.class).value() + " select from all providers " + invokers + " for service " + getInterface().getName() + " method " + invocation.getMethodName() + " on consumer " + NetUtils.getLocalHost() + " use dubbo version " + Version.getVersion() + ", but no luck to perform the invocation. Last error is: " + e.getMessage(), e); + throw new RpcException(e instanceof RpcException ? ((RpcException)e).getCode() : 0, "Failfast invoke providers " + invoker.getUrl() + " " + loadbalance.getClass().getSimpleName() + " select from all providers " + invokers + " for service " + getInterface().getName() + " method " + invocation.getMethodName() + " on consumer " + NetUtils.getLocalHost() + " use dubbo version " + Version.getVersion() + ", but no luck to perform the invocation. Last error is: " + e.getMessage(), e); } } } \ No newline at end of file diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailoverCluster.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailoverCluster.java index d8ecd0c68b..773b292e27 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailoverCluster.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailoverCluster.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.cluster.Cluster; @@ -28,7 +27,6 @@ import com.alibaba.dubbo.rpc.cluster.Directory; * * @author william.liangf */ -@Extension(FailoverCluster.NAME) public class FailoverCluster implements Cluster { public final static String NAME = "failover"; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailsafeCluster.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailsafeCluster.java index 5a7eea0d80..972960f4e2 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailsafeCluster.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailsafeCluster.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.cluster.Cluster; @@ -28,7 +27,6 @@ import com.alibaba.dubbo.rpc.cluster.Directory; * * @author william.liangf */ -@Extension(FailsafeCluster.NAME) public class FailsafeCluster implements Cluster { public final static String NAME = "failsafe"; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/ForkingCluster.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/ForkingCluster.java index 56f3bc9ddd..f147efd1eb 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/ForkingCluster.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/ForkingCluster.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.cluster.Cluster; @@ -28,7 +27,6 @@ import com.alibaba.dubbo.rpc.cluster.Directory; * * @author william.liangf */ -@Extension(ForkingCluster.NAME) public class ForkingCluster implements Cluster { public final static String NAME = "forking"; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/MergeableCluster.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/MergeableCluster.java index 5666a66a2a..29ebbc4da9 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/MergeableCluster.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/MergeableCluster.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.cluster.Cluster; @@ -24,7 +23,6 @@ import com.alibaba.dubbo.rpc.cluster.Directory; /** * @author kimi */ -@Extension( MergeableCluster.NAME ) public class MergeableCluster implements Cluster { public static final String NAME = "mergeable"; diff --git a/dubbo-cluster/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.Cluster b/dubbo-cluster/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.Cluster index d1d51ab21a..5798714bf2 100644 --- a/dubbo-cluster/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.Cluster +++ b/dubbo-cluster/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.Cluster @@ -1,7 +1,7 @@ -com.alibaba.dubbo.rpc.cluster.support.FailoverCluster -com.alibaba.dubbo.rpc.cluster.support.FailfastCluster -com.alibaba.dubbo.rpc.cluster.support.FailsafeCluster -com.alibaba.dubbo.rpc.cluster.support.FailbackCluster -com.alibaba.dubbo.rpc.cluster.support.ForkingCluster -com.alibaba.dubbo.rpc.cluster.support.AvailableCluster -com.alibaba.dubbo.rpc.cluster.support.MergeableCluster \ No newline at end of file +failover=com.alibaba.dubbo.rpc.cluster.support.FailoverCluster +failfast=com.alibaba.dubbo.rpc.cluster.support.FailfastCluster +failsafe=com.alibaba.dubbo.rpc.cluster.support.FailsafeCluster +failback=com.alibaba.dubbo.rpc.cluster.support.FailbackCluster +forking=com.alibaba.dubbo.rpc.cluster.support.ForkingCluster +available=com.alibaba.dubbo.rpc.cluster.support.AvailableCluster +mergeable=com.alibaba.dubbo.rpc.cluster.support.MergeableCluster \ No newline at end of file diff --git a/dubbo-cluster/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.LoadBalance b/dubbo-cluster/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.LoadBalance index 6bf44c0d97..3d4e7e2c21 100644 --- a/dubbo-cluster/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.LoadBalance +++ b/dubbo-cluster/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.LoadBalance @@ -1,4 +1,4 @@ -com.alibaba.dubbo.rpc.cluster.loadbalance.LoadBalanceAdptive -com.alibaba.dubbo.rpc.cluster.loadbalance.RandomLoadBalance -com.alibaba.dubbo.rpc.cluster.loadbalance.RoundRobinLoadBalance -com.alibaba.dubbo.rpc.cluster.loadbalance.LeastActiveLoadBalance \ No newline at end of file +adptive=com.alibaba.dubbo.rpc.cluster.loadbalance.LoadBalanceAdptive +random=com.alibaba.dubbo.rpc.cluster.loadbalance.RandomLoadBalance +roundrobin=com.alibaba.dubbo.rpc.cluster.loadbalance.RoundRobinLoadBalance +leastactive=com.alibaba.dubbo.rpc.cluster.loadbalance.LeastActiveLoadBalance \ No newline at end of file diff --git a/dubbo-cluster/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.Merger b/dubbo-cluster/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.Merger index 3c97878725..fa17ef332b 100644 --- a/dubbo-cluster/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.Merger +++ b/dubbo-cluster/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.Merger @@ -1,3 +1,3 @@ -com.alibaba.dubbo.rpc.cluster.merger.ArrayMerger -com.alibaba.dubbo.rpc.cluster.merger.CollectionMerger -com.alibaba.dubbo.rpc.cluster.merger.MapMerger \ No newline at end of file +array=com.alibaba.dubbo.rpc.cluster.merger.ArrayMerger +collection=com.alibaba.dubbo.rpc.cluster.merger.CollectionMerger +map=com.alibaba.dubbo.rpc.cluster.merger.MapMerger \ No newline at end of file diff --git a/dubbo-cluster/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.RouterFactory b/dubbo-cluster/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.RouterFactory index a5021fb88b..cbf1a42953 100644 --- a/dubbo-cluster/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.RouterFactory +++ b/dubbo-cluster/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.RouterFactory @@ -1,2 +1,2 @@ -com.alibaba.dubbo.rpc.cluster.router.FileRouterFactory -com.alibaba.dubbo.rpc.cluster.router.ScriptRouterFactory \ No newline at end of file +file=com.alibaba.dubbo.rpc.cluster.router.FileRouterFactory +script=com.alibaba.dubbo.rpc.cluster.router.ScriptRouterFactory \ No newline at end of file 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 b806424568..cc5f1e215e 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,7 @@ import java.lang.annotation.Target; * * @see ExtensionLoader * @see URL - * @see Extension + * @see Default */ @Documented @Retention(RetentionPolicy.RUNTIME) @@ -38,7 +38,7 @@ public @interface Adaptive { /** * 从{@link URL}的Key名，对应的Value作为要Adapt成的Extension名。 *

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

    *
  1. 先在URL上找key1的Value作为要Adapt成的Extension名； @@ -50,7 +50,7 @@ public @interface Adaptive { * 如果不设置则缺省使用Extension接口类名的点分隔小写字串。
    * 即对于Extension接口{@code com.alibaba.dubbo.xxx.YyyInvokerWrapper}的缺省值为String[] {"yyy.invoker.wrapper"} * - * @see Extension#value() + * @see Default#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 new file mode 100644 index 0000000000..a235c89354 --- /dev/null +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Default.java @@ -0,0 +1,41 @@ +/* + * 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() default ""; +} \ 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 95ef1e7d82..b0a2333192 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 @@ -24,9 +24,12 @@ 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}) 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 a323e7bf00..6f97c278e5 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,7 @@ import com.alibaba.dubbo.common.utils.StringUtils; * @author william.liangf * @author ding.lid * - * @see Extension + * @see Default * @see Adaptive */ public class ExtensionLoader { @@ -64,6 +64,8 @@ public class ExtensionLoader { private static final ConcurrentMap, ExtensionLoader> EXTENSION_LOADERS = new ConcurrentHashMap, ExtensionLoader>(); private final Class type; + + private final ConcurrentMap, String> cachedNames = new ConcurrentHashMap, String>(); private final Reference>> cachedClasses = new Reference>>(); @@ -96,7 +98,15 @@ public class ExtensionLoader { private ExtensionLoader(Class type) { this.type = type; } - + + public String getExtensionName(T extensionInstance) { + return getExtensionName(extensionInstance.getClass()); + } + + public String getExtensionName(Class extensionClass) { + return cachedNames.get(extensionClass); + } + @SuppressWarnings("unchecked") public T getExtension(String name) { if (name == null || name.length() == 0) @@ -277,7 +287,7 @@ public class ExtensionLoader { } private Map> loadExtensionClasses() { - final Extension defaultAnnotation = type.getAnnotation(Extension.class); + final Default defaultAnnotation = type.getAnnotation(Default.class); if(defaultAnnotation != null) { String[] names = NAME_SEPARATOR.split(defaultAnnotation.value()); if(names.length > 1) { @@ -311,6 +321,12 @@ public class ExtensionLoader { line = line.trim(); if (line.length() > 0) { try { + String name = null; + int i = line.indexOf('='); + if (i > 0) { + name = line.substring(0, i).trim(); + line = line.substring(i + 1).trim(); + } Class clazz = Class.forName(line, true, classLoader); if (! type.isAssignableFrom(clazz)) { throw new IllegalStateException("Error when load extension class(interface: " + @@ -336,16 +352,22 @@ public class ExtensionLoader { wrappers.add(clazz); } catch (NoSuchMethodException e) { clazz.getConstructor(); - Extension extension = clazz.getAnnotation(Extension.class); - if (extension == null) { - throw new IllegalStateException("No such @Extension annotation in class " + clazz.getName()); - } - String name = extension.value(); if (name == null || name.length() == 0) { - throw new IllegalStateException("Illegal @Extension annotation in class " + clazz.getName()); + name = findAnnotationName(clazz); + if (name == null || name.length() == 0) { + if (clazz.getSimpleName().length() > type.getSimpleName().length() + && clazz.getSimpleName().endsWith(type.getSimpleName())) { + name = clazz.getSimpleName().substring(0, clazz.getSimpleName().length() - type.getSimpleName().length()).toLowerCase(); + } else { + throw new IllegalStateException("No such extension name for the class " + clazz.getName() + " in the config " + url); + } + } } String[] names = NAME_SEPARATOR.split(name); for (String n : names) { + if (! cachedNames.containsKey(clazz)) { + cachedNames.put(clazz, n); + } Class c = extensionClasses.get(n); if (c == null) { extensionClasses.put(n, clazz); @@ -377,6 +399,12 @@ public class ExtensionLoader { return extensionClasses; } + @SuppressWarnings("deprecation") + private String findAnnotationName(Class clazz) { + Extension extension = clazz.getAnnotation(Extension.class); + return extension == null ? null : extension.value(); + } + @SuppressWarnings("unchecked") private T createAdaptiveExtension() { try { 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 e67b35dbd0..ad1102a234 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.Extension; +import com.alibaba.dubbo.common.Default; import com.alibaba.dubbo.common.URL; /** @@ -29,7 +29,7 @@ import com.alibaba.dubbo.common.URL; * @author ding.lid * @author william.liangf */ -@Extension("hessian2") +@Default("hessian2") public interface Serialization { /** diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/DubboSerialization.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/DubboSerialization.java index b1111226ee..3b8a240254 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/DubboSerialization.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/DubboSerialization.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.serialize.ObjectInput; import com.alibaba.dubbo.common.serialize.ObjectOutput; @@ -28,7 +27,6 @@ import com.alibaba.dubbo.common.serialize.Serialization; /** * @author ding.lid */ -@Extension("dubbo") public class DubboSerialization implements Serialization { public byte getContentTypeId() { diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/hessian/Hessian2Serialization.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/hessian/Hessian2Serialization.java index 1c8431de1b..fa61b1b255 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/hessian/Hessian2Serialization.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/hessian/Hessian2Serialization.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.serialize.ObjectInput; import com.alibaba.dubbo.common.serialize.ObjectOutput; @@ -28,7 +27,6 @@ import com.alibaba.dubbo.common.serialize.Serialization; /** * @author ding.lid */ -@Extension("hessian2") public class Hessian2Serialization implements Serialization { public static final byte ID = 2; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/java/CompactedJavaSerialization.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/java/CompactedJavaSerialization.java index 15353685b1..7b6fd26a50 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/java/CompactedJavaSerialization.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/java/CompactedJavaSerialization.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.serialize.ObjectInput; import com.alibaba.dubbo.common.serialize.ObjectOutput; @@ -28,7 +27,6 @@ import com.alibaba.dubbo.common.serialize.Serialization; /** * @author ding.lid */ -@Extension("compactedjava") public class CompactedJavaSerialization implements Serialization { public byte getContentTypeId() { diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/java/JavaSerialization.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/java/JavaSerialization.java index 58f1a1cc6a..e3b6d4b526 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/java/JavaSerialization.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/java/JavaSerialization.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.serialize.ObjectInput; import com.alibaba.dubbo.common.serialize.ObjectOutput; @@ -28,7 +27,6 @@ import com.alibaba.dubbo.common.serialize.Serialization; /** * @author ding.lid */ -@Extension("java") public class JavaSerialization implements Serialization { public byte getContentTypeId() { diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/json/FastJsonSerialization.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/json/FastJsonSerialization.java index 5e94197273..28c00e690d 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/json/FastJsonSerialization.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/json/FastJsonSerialization.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.serialize.ObjectInput; import com.alibaba.dubbo.common.serialize.ObjectOutput; @@ -30,7 +29,6 @@ import com.alibaba.dubbo.common.serialize.Serialization; * * @author william.liangf */ -@Extension("fastjson") public class FastJsonSerialization implements Serialization { public byte getContentTypeId() { diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/json/JsonSerialization.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/json/JsonSerialization.java index 590e9df2a2..0628fddb17 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/json/JsonSerialization.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/json/JsonSerialization.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.serialize.ObjectInput; import com.alibaba.dubbo.common.serialize.ObjectOutput; @@ -30,7 +29,6 @@ import com.alibaba.dubbo.common.serialize.Serialization; * * @author william.liangf */ -@Extension("json") public class JsonSerialization implements Serialization { public byte getContentTypeId() { 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 c97bad621c..950dfcba5e 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,14 +15,14 @@ */ package com.alibaba.dubbo.common.status; -import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.Default; /** * StatusChecker * * @author william.liangf */ -@Extension +@Default public interface StatusChecker { /** diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/LoadStatusChecker.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/LoadStatusChecker.java index dc08083ea7..58f88cf6b2 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/LoadStatusChecker.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/LoadStatusChecker.java @@ -19,7 +19,6 @@ import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; import java.lang.reflect.Method; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.status.Status; import com.alibaba.dubbo.common.status.StatusChecker; @@ -28,7 +27,6 @@ import com.alibaba.dubbo.common.status.StatusChecker; * * @author william.liangf */ -@Extension("load") public class LoadStatusChecker implements StatusChecker { public Status check() { diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/MemoryStatusChecker.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/MemoryStatusChecker.java index c250bf914a..901b548c08 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/MemoryStatusChecker.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/MemoryStatusChecker.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.common.status.support; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.status.Status; import com.alibaba.dubbo.common.status.StatusChecker; @@ -24,7 +23,6 @@ import com.alibaba.dubbo.common.status.StatusChecker; * * @author william.liangf */ -@Extension("memory") public class MemoryStatusChecker implements StatusChecker { public Status check() { 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 ceabd645c4..dae967d228 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.Extension; +import com.alibaba.dubbo.common.Default; import com.alibaba.dubbo.common.URL; /** @@ -27,7 +27,7 @@ import com.alibaba.dubbo.common.URL; * * @author william.liangf */ -@Extension("fixed") +@Default("fixed") public interface ThreadPool { /** diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/cached/CachedThreadPool.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/cached/CachedThreadPool.java index 6f8fe45612..5d9cdc0322 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/cached/CachedThreadPool.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/cached/CachedThreadPool.java @@ -22,7 +22,6 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.threadpool.ThreadPool; import com.alibaba.dubbo.common.threadpool.support.AbortPolicyWithReport; @@ -34,7 +33,6 @@ import com.alibaba.dubbo.common.utils.NamedThreadFactory; * @see java.util.concurrent.Executors#newCachedThreadPool() * @author william.liangf */ -@Extension("cached") public class CachedThreadPool implements ThreadPool { public Executor getExecutor(URL url) { diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/fixed/FixedThreadPool.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/fixed/FixedThreadPool.java index 24a74b3eae..4ed95c738e 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/fixed/FixedThreadPool.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/fixed/FixedThreadPool.java @@ -22,7 +22,6 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.threadpool.ThreadPool; import com.alibaba.dubbo.common.threadpool.support.AbortPolicyWithReport; @@ -34,7 +33,6 @@ import com.alibaba.dubbo.common.utils.NamedThreadFactory; * @see java.util.concurrent.Executors#newFixedThreadPool(int) * @author william.liangf */ -@Extension("fixed") public class FixedThreadPool implements ThreadPool { public Executor getExecutor(URL url) { diff --git a/dubbo-common/src/main/resources/META-INF/services/com.alibaba.dubbo.common.serialize.Serialization b/dubbo-common/src/main/resources/META-INF/services/com.alibaba.dubbo.common.serialize.Serialization index 09bd8e97e5..fec7fc4ab4 100644 --- a/dubbo-common/src/main/resources/META-INF/services/com.alibaba.dubbo.common.serialize.Serialization +++ b/dubbo-common/src/main/resources/META-INF/services/com.alibaba.dubbo.common.serialize.Serialization @@ -1,6 +1,6 @@ -com.alibaba.dubbo.common.serialize.support.dubbo.DubboSerialization -com.alibaba.dubbo.common.serialize.support.hessian.Hessian2Serialization -com.alibaba.dubbo.common.serialize.support.java.JavaSerialization -com.alibaba.dubbo.common.serialize.support.java.CompactedJavaSerialization -com.alibaba.dubbo.common.serialize.support.json.JsonSerialization -com.alibaba.dubbo.common.serialize.support.json.FastJsonSerialization \ No newline at end of file +dubbo=com.alibaba.dubbo.common.serialize.support.dubbo.DubboSerialization +hessian2=com.alibaba.dubbo.common.serialize.support.hessian.Hessian2Serialization +java=com.alibaba.dubbo.common.serialize.support.java.JavaSerialization +compactedjava=com.alibaba.dubbo.common.serialize.support.java.CompactedJavaSerialization +json=com.alibaba.dubbo.common.serialize.support.json.JsonSerialization +fastjson=com.alibaba.dubbo.common.serialize.support.json.FastJsonSerialization \ No newline at end of file diff --git a/dubbo-common/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker b/dubbo-common/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker index 3d14c969cd..d4eca747fd 100644 --- a/dubbo-common/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker +++ b/dubbo-common/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker @@ -1,2 +1,2 @@ -com.alibaba.dubbo.common.status.support.MemoryStatusChecker -com.alibaba.dubbo.common.status.support.LoadStatusChecker \ No newline at end of file +memory=com.alibaba.dubbo.common.status.support.MemoryStatusChecker +load=com.alibaba.dubbo.common.status.support.LoadStatusChecker \ No newline at end of file diff --git a/dubbo-common/src/main/resources/META-INF/services/com.alibaba.dubbo.common.threadpool.ThreadPool b/dubbo-common/src/main/resources/META-INF/services/com.alibaba.dubbo.common.threadpool.ThreadPool index 91dae06bc7..e698e73a2b 100644 --- a/dubbo-common/src/main/resources/META-INF/services/com.alibaba.dubbo.common.threadpool.ThreadPool +++ b/dubbo-common/src/main/resources/META-INF/services/com.alibaba.dubbo.common.threadpool.ThreadPool @@ -1,2 +1,2 @@ -com.alibaba.dubbo.common.threadpool.support.fixed.FixedThreadPool -com.alibaba.dubbo.common.threadpool.support.cached.CachedThreadPool \ No newline at end of file +fixed=com.alibaba.dubbo.common.threadpool.support.fixed.FixedThreadPool +cached=com.alibaba.dubbo.common.threadpool.support.cached.CachedThreadPool \ No newline at end of file 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 3744f085b2..6bcefaaa1d 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 @@ -16,13 +16,13 @@ package com.alibaba.dubbo.common.extensionloader.ext1; import com.alibaba.dubbo.common.Adaptive; -import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.Default; import com.alibaba.dubbo.common.URL; /** * @author ding.lid */ -@Extension("impl1") +@Default("impl1") public interface Ext1 { @Adaptive String echo(URL url, String s); diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/Ext1Impl1.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/Ext1Impl1.java index f783345268..a059eb89f5 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/Ext1Impl1.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/Ext1Impl1.java @@ -15,14 +15,12 @@ */ package com.alibaba.dubbo.common.extensionloader.ext1.impl; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext1.Ext1; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.extensionloader.ext1.Ext1; /** * @author ding.lid */ -@Extension(value = "impl1") public class Ext1Impl1 implements Ext1 { public String echo(URL url, String s) { return "Ext1Impl1-echo"; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/Ext1Impl2.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/Ext1Impl2.java index 2e76cee146..12e9265dc4 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/Ext1Impl2.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/Ext1Impl2.java @@ -15,15 +15,13 @@ */ package com.alibaba.dubbo.common.extensionloader.ext1.impl; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext1.Ext1; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.extensionloader.ext1.Ext1; /** * @author ding.lid * */ -@Extension("impl2") public class Ext1Impl2 implements Ext1 { public String echo(URL url, String s) { return "Ext1Impl2-echo"; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/Ext1Impl3.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/Ext1Impl3.java index e3590ecd94..86e18de6f0 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/Ext1Impl3.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/Ext1Impl3.java @@ -15,15 +15,13 @@ */ package com.alibaba.dubbo.common.extensionloader.ext1.impl; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext1.Ext1; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.extensionloader.ext1.Ext1; /** * @author ding.lid * */ -@Extension("impl3") public class Ext1Impl3 implements Ext1 { public String echo(URL url, String s) { return "Ext1Impl3-echo"; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl1.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl1.java index 2abe4e2291..5eb0b8c1f7 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl1.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl1.java @@ -15,15 +15,13 @@ */ package com.alibaba.dubbo.common.extensionloader.ext2.impl; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext2.Ext2; -import com.alibaba.dubbo.common.extensionloader.ext2.UrlHolder; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.extensionloader.ext2.Ext2; +import com.alibaba.dubbo.common.extensionloader.ext2.UrlHolder; /** * @author ding.lid */ -@Extension(value = "impl1") public class Ext2Impl1 implements Ext2 { public String echo(UrlHolder holder, String s) { return "Ext2Impl1-echo"; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl2.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl2.java index 51b8202fac..3597345ee6 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl2.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl2.java @@ -15,16 +15,14 @@ */ package com.alibaba.dubbo.common.extensionloader.ext2.impl; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext2.Ext2; -import com.alibaba.dubbo.common.extensionloader.ext2.UrlHolder; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.extensionloader.ext2.Ext2; +import com.alibaba.dubbo.common.extensionloader.ext2.UrlHolder; /** * @author ding.lid * */ -@Extension("impl2") public class Ext2Impl2 implements Ext2 { public String echo(UrlHolder holder, String s) { return "Ext2Impl2-echo"; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl3.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl3.java index f51998f737..8f1805ebef 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl3.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl3.java @@ -15,16 +15,14 @@ */ package com.alibaba.dubbo.common.extensionloader.ext2.impl; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext2.Ext2; -import com.alibaba.dubbo.common.extensionloader.ext2.UrlHolder; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.extensionloader.ext2.Ext2; +import com.alibaba.dubbo.common.extensionloader.ext2.UrlHolder; /** * @author ding.lid * */ -@Extension("impl3") public class Ext2Impl3 implements Ext2 { public String echo(UrlHolder holder, String s) { return "Ext2Impl3-echo"; 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 ecdd3ccbb5..523d41d370 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 @@ -16,13 +16,13 @@ package com.alibaba.dubbo.common.extensionloader.ext3; import com.alibaba.dubbo.common.Adaptive; -import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.Default; import com.alibaba.dubbo.common.URL; /** * @author ding.lid */ -@Extension("impl3") +@Default("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/ext3/impl/Ext3Impl1.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/Ext3Impl1.java index d25174e768..9d8e29b813 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/Ext3Impl1.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/Ext3Impl1.java @@ -15,14 +15,12 @@ */ package com.alibaba.dubbo.common.extensionloader.ext3.impl; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext3.Ext3; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.extensionloader.ext3.Ext3; /** * @author ding.lid */ -@Extension(value = "impl1") public class Ext3Impl1 implements Ext3 { public String echo(URL url, String s) { return "Ext3Impl3-echo"; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/Ext3Impl2.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/Ext3Impl2.java index 678d5462d4..5953c939c1 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/Ext3Impl2.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/Ext3Impl2.java @@ -15,15 +15,13 @@ */ package com.alibaba.dubbo.common.extensionloader.ext3.impl; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext3.Ext3; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.extensionloader.ext3.Ext3; /** * @author ding.lid * */ -@Extension("impl2") public class Ext3Impl2 implements Ext3 { public String echo(URL url, String s) { return "Ext3Impl2-echo"; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/Ext3Impl3.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/Ext3Impl3.java index 90c30bbdf4..ae5b6d129b 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/Ext3Impl3.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/Ext3Impl3.java @@ -15,15 +15,13 @@ */ package com.alibaba.dubbo.common.extensionloader.ext3.impl; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext3.Ext3; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.extensionloader.ext3.Ext3; /** * @author ding.lid * */ -@Extension(value="impl3") public class Ext3Impl3 implements Ext3 { public String echo(URL url, String s) { return "Ext3Impl3-echo"; 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 76685d392c..f750c293ce 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 @@ -18,12 +18,12 @@ package com.alibaba.dubbo.common.extensionloader.ext4; import java.util.List; import com.alibaba.dubbo.common.Adaptive; -import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.Default; /** * @author ding.lid */ -@Extension("impl1") +@Default("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/ext4/impl/Ext4Impl1.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/impl/Ext4Impl1.java index 9df9d0b7f4..6e72d8dff7 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/impl/Ext4Impl1.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/impl/Ext4Impl1.java @@ -15,15 +15,13 @@ */ package com.alibaba.dubbo.common.extensionloader.ext4.impl; -import java.util.List; - -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.extensionloader.ext4.Ext4; +import java.util.List; + +import com.alibaba.dubbo.common.extensionloader.ext4.Ext4; /** * @author ding.lid */ -@Extension(value = "impl1") public class Ext4Impl1 implements Ext4 { public String bark(String name, List list) { return null; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/impl/Ext4Impl2.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/impl/Ext4Impl2.java index f3a8c14537..bf9811111a 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/impl/Ext4Impl2.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/impl/Ext4Impl2.java @@ -15,17 +15,15 @@ */ package com.alibaba.dubbo.common.extensionloader.ext4.impl; -import java.util.List; - -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext4.Ext4; +import java.util.List; + +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.extensionloader.ext4.Ext4; /** * @author ding.lid * */ -@Extension("impl2") public class Ext4Impl2 implements Ext4 { public String echo(URL url, String s) { return "Ext3Impl2-echo"; 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 a347956393..77a372f8fd 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.Extension; +import com.alibaba.dubbo.common.Default; import com.alibaba.dubbo.common.URL; /** * @author ding.lid */ -@Extension("impl1") +@Default("impl1") public interface Ext5NoAdaptiveMethod { String echo(URL url, String s); diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Impl1.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Impl1.java index 762edf0694..f674af04ef 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Impl1.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Impl1.java @@ -15,14 +15,12 @@ */ package com.alibaba.dubbo.common.extensionloader.ext5.impl; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext5.Ext5NoAdaptiveMethod; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.extensionloader.ext5.Ext5NoAdaptiveMethod; /** * @author ding.lid */ -@Extension("impl1") public class Ext5Impl1 implements Ext5NoAdaptiveMethod { public String echo(URL url, String s) { return "Ext5Impl1-echo"; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Impl2.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Impl2.java index f517a04d66..a6c6cda0ae 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Impl2.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Impl2.java @@ -15,15 +15,13 @@ */ package com.alibaba.dubbo.common.extensionloader.ext5.impl; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext5.Ext5NoAdaptiveMethod; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.extensionloader.ext5.Ext5NoAdaptiveMethod; /** * @author ding.lid * */ -@Extension("impl2") public class Ext5Impl2 implements Ext5NoAdaptiveMethod { public String echo(URL url, String s) { return "Ext5Impl2-echo"; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Wrapper1.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Wrapper1.java index f6b012509f..a151777013 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Wrapper1.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Wrapper1.java @@ -15,16 +15,14 @@ */ package com.alibaba.dubbo.common.extensionloader.ext5.impl; -import java.util.concurrent.atomic.AtomicInteger; - -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext5.Ext5NoAdaptiveMethod; +import java.util.concurrent.atomic.AtomicInteger; + +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.extensionloader.ext5.Ext5NoAdaptiveMethod; /** * @author ding.lid */ -@Extension("XXX") public class Ext5Wrapper1 implements Ext5NoAdaptiveMethod { Ext5NoAdaptiveMethod instance; 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 7990f4582d..e8acc88bc9 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,7 +16,7 @@ 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.Default; import com.alibaba.dubbo.common.URL; /** @@ -24,7 +24,7 @@ import com.alibaba.dubbo.common.URL; * * @author ding.lid */ -@Extension +@Default public interface Ext6 { @Adaptive String echo(URL url, String s); diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/DaoImpl.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/DaoImpl.java index 077e49fba1..89a7cde0be 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/DaoImpl.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/DaoImpl.java @@ -1,9 +1,7 @@ package com.alibaba.dubbo.common.extensionloader.ext6_inject.impl; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.extensionloader.ext6_inject.Dao; -@Extension("test") public class DaoImpl implements Dao { public void update(){ diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl1.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl1.java index 98ecda3b74..d3a64f19d4 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl1.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl1.java @@ -17,7 +17,6 @@ package com.alibaba.dubbo.common.extensionloader.ext6_inject.impl; import junit.framework.Assert; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.extensionloader.ext1.Ext1; import com.alibaba.dubbo.common.extensionloader.ext6_inject.Dao; @@ -26,7 +25,6 @@ import com.alibaba.dubbo.common.extensionloader.ext6_inject.Ext6; /** * @author ding.lid */ -@Extension(value = "impl1") public class Ext6Impl1 implements Ext6 { Ext1 ext1; public Dao obj; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl2.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl2.java index 35ad0cdd36..4b937671f3 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl2.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl2.java @@ -15,16 +15,14 @@ */ package com.alibaba.dubbo.common.extensionloader.ext6_inject.impl; -import java.util.List; - -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext6_inject.Ext6; +import java.util.List; + +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.extensionloader.ext6_inject.Ext6; /** * @author ding.lid */ -@Extension("impl2") public class Ext6Impl2 implements Ext6 { List list; 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 d7e1578460..3c1164b8fe 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,7 +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.Default; import com.alibaba.dubbo.common.URL; /** @@ -25,7 +25,7 @@ import com.alibaba.dubbo.common.URL; * * @author ding.lid */ -@Extension +@Default public interface Ext7 { @Adaptive String echo(URL url, String s); diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/impl/Ext7Impl.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/impl/Ext7Impl.java index 840196d13d..3eedd086e2 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/impl/Ext7Impl.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/impl/Ext7Impl.java @@ -15,14 +15,12 @@ */ package com.alibaba.dubbo.common.extensionloader.ext7.impl; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.extensionloader.ext7.Ext7; /** * @author ding.lid */ -@Extension(value = "ok") public class Ext7Impl implements Ext7 { public String echo(URL url, String s) { return ""; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/impl/Ext7InitErrorImpl.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/impl/Ext7InitErrorImpl.java index b5663ad60a..0edba0e1ee 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/impl/Ext7InitErrorImpl.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/impl/Ext7InitErrorImpl.java @@ -15,14 +15,12 @@ */ package com.alibaba.dubbo.common.extensionloader.ext7.impl; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.extensionloader.ext7.Ext7; /** * @author ding.lid */ -@Extension(value = "error") public class Ext7InitErrorImpl implements Ext7 { static { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ConfigUtilsTest.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ConfigUtilsTest.java index a6ea8bcd2d..87d9bda563 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ConfigUtilsTest.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ConfigUtilsTest.java @@ -94,8 +94,8 @@ public class ConfigUtilsTest { Properties p = ConfigUtils.loadProperties("META-INF/services/com.alibaba.dubbo.common.threadpool.ThreadPool", false); Properties expected = new Properties(); - expected.put("com.alibaba.dubbo.common.threadpool.support.fixed.FixedThreadPool", ""); - expected.put("com.alibaba.dubbo.common.threadpool.support.cached.CachedThreadPool", ""); + expected.put("fixed", "com.alibaba.dubbo.common.threadpool.support.fixed.FixedThreadPool"); + expected.put("cached", "com.alibaba.dubbo.common.threadpool.support.cached.CachedThreadPool"); Assert.assertEquals(expected, p); } @@ -118,8 +118,8 @@ public class ConfigUtilsTest { Properties p = ConfigUtils.loadProperties("META-INF/services/com.alibaba.dubbo.common.status.StatusChecker", true); Properties expected = new Properties(); - expected.put("com.alibaba.dubbo.common.status.support.MemoryStatusChecker", ""); - expected.put("com.alibaba.dubbo.common.status.support.LoadStatusChecker", ""); + expected.put("memory", "com.alibaba.dubbo.common.status.support.MemoryStatusChecker"); + expected.put("load", "com.alibaba.dubbo.common.status.support.LoadStatusChecker"); expected.put("aa", "12"); Assert.assertEquals(expected, p); diff --git a/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext1.Ext1 b/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext1.Ext1 index ac515d6142..ea1ce319c6 100644 --- a/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext1.Ext1 +++ b/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext1.Ext1 @@ -1,4 +1,4 @@ # Comment 1 -com.alibaba.dubbo.common.extensionloader.ext1.impl.Ext1Impl1#Hello World -com.alibaba.dubbo.common.extensionloader.ext1.impl.Ext1Impl2 # Comment 2 - com.alibaba.dubbo.common.extensionloader.ext1.impl.Ext1Impl3 # with head space \ No newline at end of file +impl1=com.alibaba.dubbo.common.extensionloader.ext1.impl.Ext1Impl1#Hello World +impl2=com.alibaba.dubbo.common.extensionloader.ext1.impl.Ext1Impl2 # Comment 2 + impl3=com.alibaba.dubbo.common.extensionloader.ext1.impl.Ext1Impl3 # with head space \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext2.Ext2 b/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext2.Ext2 index c58f1e4304..e275f40c54 100644 --- a/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext2.Ext2 +++ b/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext2.Ext2 @@ -1,3 +1,3 @@ -com.alibaba.dubbo.common.extensionloader.ext2.impl.Ext2Impl1 -com.alibaba.dubbo.common.extensionloader.ext2.impl.Ext2Impl2 -com.alibaba.dubbo.common.extensionloader.ext2.impl.Ext2Impl3 \ No newline at end of file +impl1=com.alibaba.dubbo.common.extensionloader.ext2.impl.Ext2Impl1 +impl2=com.alibaba.dubbo.common.extensionloader.ext2.impl.Ext2Impl2 +impl3=com.alibaba.dubbo.common.extensionloader.ext2.impl.Ext2Impl3 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext3.Ext3 b/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext3.Ext3 index b0e93dcf3f..62bfa83869 100644 --- a/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext3.Ext3 +++ b/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext3.Ext3 @@ -1,3 +1,3 @@ -com.alibaba.dubbo.common.extensionloader.ext3.impl.Ext3Impl1 -com.alibaba.dubbo.common.extensionloader.ext3.impl.Ext3Impl2 -com.alibaba.dubbo.common.extensionloader.ext3.impl.Ext3Impl3 \ No newline at end of file +impl1=com.alibaba.dubbo.common.extensionloader.ext3.impl.Ext3Impl1 +impl2=com.alibaba.dubbo.common.extensionloader.ext3.impl.Ext3Impl2 +impl3=com.alibaba.dubbo.common.extensionloader.ext3.impl.Ext3Impl3 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext4.Ext4 b/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext4.Ext4 index a70b49d813..3c64e22ae8 100644 --- a/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext4.Ext4 +++ b/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext4.Ext4 @@ -1,2 +1,2 @@ -com.alibaba.dubbo.common.extensionloader.ext4.impl.Ext4Impl1 -com.alibaba.dubbo.common.extensionloader.ext4.impl.Ext4Impl2 \ No newline at end of file +impl1=com.alibaba.dubbo.common.extensionloader.ext4.impl.Ext4Impl1 +impl2=com.alibaba.dubbo.common.extensionloader.ext4.impl.Ext4Impl2 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext5.Ext5NoAdaptiveMethod b/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext5.Ext5NoAdaptiveMethod index 6b655f9fe0..5604232eb2 100644 --- a/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext5.Ext5NoAdaptiveMethod +++ b/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext5.Ext5NoAdaptiveMethod @@ -1,4 +1,4 @@ -com.alibaba.dubbo.common.extensionloader.ext5.impl.Ext5Impl1 -com.alibaba.dubbo.common.extensionloader.ext5.impl.Ext5Impl2 -com.alibaba.dubbo.common.extensionloader.ext5.impl.Ext5Wrapper1 -com.alibaba.dubbo.common.extensionloader.ext5.impl.Ext5Wrapper2 \ No newline at end of file +impl1=com.alibaba.dubbo.common.extensionloader.ext5.impl.Ext5Impl1 +impl2=com.alibaba.dubbo.common.extensionloader.ext5.impl.Ext5Impl2 +wrapper1=com.alibaba.dubbo.common.extensionloader.ext5.impl.Ext5Wrapper1 +wrapper2=com.alibaba.dubbo.common.extensionloader.ext5.impl.Ext5Wrapper2 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext6_inject.Ext6 b/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext6_inject.Ext6 index 6dd3b3c110..885aef5227 100644 --- a/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext6_inject.Ext6 +++ b/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext6_inject.Ext6 @@ -1,2 +1,2 @@ -com.alibaba.dubbo.common.extensionloader.ext6_inject.impl.Ext6Impl1 -com.alibaba.dubbo.common.extensionloader.ext6_inject.impl.Ext6Impl2 \ No newline at end of file +impl1=com.alibaba.dubbo.common.extensionloader.ext6_inject.impl.Ext6Impl1 +impl2=com.alibaba.dubbo.common.extensionloader.ext6_inject.impl.Ext6Impl2 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext7.Ext7 b/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext7.Ext7 index a294fad107..5fa7829fcf 100644 --- a/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext7.Ext7 +++ b/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.ext7.Ext7 @@ -1,2 +1,2 @@ -com.alibaba.dubbo.common.extensionloader.ext7.impl.Ext7InitErrorImpl -com.alibaba.dubbo.common.extensionloader.ext7.impl.Ext7Impl +error=com.alibaba.dubbo.common.extensionloader.ext7.impl.Ext7InitErrorImpl +ok=com.alibaba.dubbo.common.extensionloader.ext7.impl.Ext7Impl diff --git a/dubbo-config/src/main/java/com/alibaba/dubbo/config/spring/status/DataSourceStatusChecker.java b/dubbo-config/src/main/java/com/alibaba/dubbo/config/spring/status/DataSourceStatusChecker.java index 1e756d715f..20bbf6d327 100644 --- a/dubbo-config/src/main/java/com/alibaba/dubbo/config/spring/status/DataSourceStatusChecker.java +++ b/dubbo-config/src/main/java/com/alibaba/dubbo/config/spring/status/DataSourceStatusChecker.java @@ -24,7 +24,6 @@ import javax.sql.DataSource; import org.springframework.context.ApplicationContext; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; import com.alibaba.dubbo.common.status.Status; @@ -36,7 +35,6 @@ import com.alibaba.dubbo.config.spring.ServiceBean; * * @author william.liangf */ -@Extension("datasource") public class DataSourceStatusChecker implements StatusChecker { private static final Logger logger = LoggerFactory.getLogger(DataSourceStatusChecker.class); diff --git a/dubbo-config/src/main/java/com/alibaba/dubbo/config/spring/status/SpringStatusChecker.java b/dubbo-config/src/main/java/com/alibaba/dubbo/config/spring/status/SpringStatusChecker.java index 89675fc0a0..3e9016d75f 100644 --- a/dubbo-config/src/main/java/com/alibaba/dubbo/config/spring/status/SpringStatusChecker.java +++ b/dubbo-config/src/main/java/com/alibaba/dubbo/config/spring/status/SpringStatusChecker.java @@ -20,7 +20,6 @@ import java.lang.reflect.Method; import org.springframework.context.ApplicationContext; import org.springframework.context.Lifecycle; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; import com.alibaba.dubbo.common.status.Status; @@ -32,7 +31,6 @@ import com.alibaba.dubbo.config.spring.ServiceBean; * * @author william.liangf */ -@Extension("spring") public class SpringStatusChecker implements StatusChecker { private static final Logger logger = LoggerFactory.getLogger(SpringStatusChecker.class); diff --git a/dubbo-config/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker b/dubbo-config/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker index 4c153f9c39..fa52ac2b74 100644 --- a/dubbo-config/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker +++ b/dubbo-config/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker @@ -1,2 +1,2 @@ -com.alibaba.dubbo.config.spring.status.SpringStatusChecker -com.alibaba.dubbo.config.spring.status.DataSourceStatusChecker \ No newline at end of file +spring=com.alibaba.dubbo.config.spring.status.SpringStatusChecker +datasource=com.alibaba.dubbo.config.spring.status.DataSourceStatusChecker \ No newline at end of file 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 3905a48425..08d0646c86 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,7 +15,7 @@ */ package com.alibaba.dubbo.config.support; -import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.Default; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.rpc.Exporter; import com.alibaba.dubbo.rpc.Invocation; @@ -29,7 +29,6 @@ import com.alibaba.dubbo.rpc.RpcException; * @author haomin.liuhm * */ -@Extension("mockprotocol") public class MockProtocol implements Protocol { /* (non-Javadoc) diff --git a/dubbo-config/src/test/java/com/alibaba/dubbo/config/support/MockRegistryFactory.java b/dubbo-config/src/test/java/com/alibaba/dubbo/config/support/MockRegistryFactory.java index 421e4b03b3..f3dedbf52a 100644 --- a/dubbo-config/src/test/java/com/alibaba/dubbo/config/support/MockRegistryFactory.java +++ b/dubbo-config/src/test/java/com/alibaba/dubbo/config/support/MockRegistryFactory.java @@ -15,17 +15,15 @@ */ package com.alibaba.dubbo.config.support; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.registry.RegistryFactory; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.registry.Registry; +import com.alibaba.dubbo.registry.RegistryFactory; /** * TODO Comment of MockRegistryFactory * @author haomin.liuhm * */ -@Extension("mockregistry") public class MockRegistryFactory implements RegistryFactory { /* diff --git a/dubbo-config/src/test/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory b/dubbo-config/src/test/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory index 6095da64dd..6dd0bbd0c1 100644 --- a/dubbo-config/src/test/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory +++ b/dubbo-config/src/test/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory @@ -1 +1 @@ -com.alibaba.dubbo.config.support.MockRegistryFactory +mockregistry=com.alibaba.dubbo.config.support.MockRegistryFactory diff --git a/dubbo-config/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol b/dubbo-config/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol index 53472a6890..b95dc2e094 100644 --- a/dubbo-config/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol +++ b/dubbo-config/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol @@ -1 +1 @@ -com.alibaba.dubbo.config.support.MockProtocol \ No newline at end of file +mockprotocol=com.alibaba.dubbo.config.support.MockProtocol \ No newline at end of file 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 f64c46a0a6..65d37168d9 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.Extension; +import com.alibaba.dubbo.common.Default; /** * Container. (SPI, Singleton, ThreadSafe) * * @author william.liangf */ -@Extension("spring") +@Default("spring") public interface Container { /** diff --git a/dubbo-container/src/main/java/com/alibaba/dubbo/container/jetty/JettyContainer.java b/dubbo-container/src/main/java/com/alibaba/dubbo/container/jetty/JettyContainer.java index ca58274833..e9fae86348 100644 --- a/dubbo-container/src/main/java/com/alibaba/dubbo/container/jetty/JettyContainer.java +++ b/dubbo-container/src/main/java/com/alibaba/dubbo/container/jetty/JettyContainer.java @@ -22,7 +22,6 @@ import org.mortbay.jetty.servlet.FilterHolder; import org.mortbay.jetty.servlet.ServletHandler; import org.mortbay.jetty.servlet.ServletHolder; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; import com.alibaba.dubbo.common.utils.ConfigUtils; @@ -36,7 +35,6 @@ import com.alibaba.dubbo.container.page.ResourceFilter; * * @author william.liangf */ -@Extension("jetty") public class JettyContainer implements Container { private static final Logger logger = LoggerFactory.getLogger(JettyContainer.class); diff --git a/dubbo-container/src/main/java/com/alibaba/dubbo/container/log4j/Log4jContainer.java b/dubbo-container/src/main/java/com/alibaba/dubbo/container/log4j/Log4jContainer.java index 6bd7ce184c..68e1335ee7 100644 --- a/dubbo-container/src/main/java/com/alibaba/dubbo/container/log4j/Log4jContainer.java +++ b/dubbo-container/src/main/java/com/alibaba/dubbo/container/log4j/Log4jContainer.java @@ -23,7 +23,6 @@ import org.apache.log4j.FileAppender; import org.apache.log4j.LogManager; import org.apache.log4j.PropertyConfigurator; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.utils.ConfigUtils; import com.alibaba.dubbo.container.Container; @@ -32,7 +31,6 @@ import com.alibaba.dubbo.container.Container; * * @author william.liangf */ -@Extension("log4j") public class Log4jContainer implements Container { public static final String LOG4J_FILE = "dubbo.log4j.file"; diff --git a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/PageServlet.java b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/PageServlet.java index e6c9ea5920..e13a56398d 100644 --- a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/PageServlet.java +++ b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/PageServlet.java @@ -32,7 +32,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.ExtensionLoader; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.logger.Logger; @@ -79,7 +78,7 @@ public class PageServlet extends HttpServlet { } for (String name : names) { PageHandler handler = ExtensionLoader.getExtensionLoader(PageHandler.class).getExtension(name); - pages.put(handler.getClass().getAnnotation(Extension.class).value(), handler); + pages.put(ExtensionLoader.getExtensionLoader(PageHandler.class).getExtensionName(handler), handler); Menu menu = handler.getClass().getAnnotation(Menu.class); if (menu != null) { menus.add(handler); @@ -160,7 +159,7 @@ public class PageServlet extends HttpServlet { if (isHtml) { String nav = page.getNavigation(); if (nav == null || nav.length() == 0) { - nav = pageHandler.getClass().getAnnotation(Extension.class).value(); + nav = ExtensionLoader.getExtensionLoader(PageHandler.class).getExtensionName(pageHandler); nav = nav.substring(0, 1).toUpperCase() + nav.substring(1); } if (! "index".equals(uri)) { @@ -208,7 +207,7 @@ public class PageServlet extends HttpServlet { writer.println(""); writer.println(" "); for (PageHandler handler : menus) { - String uri = handler.getClass().getAnnotation(Extension.class).value(); + String uri = ExtensionLoader.getExtensionLoader(PageHandler.class).getExtensionName(handler); Menu menu = handler.getClass().getAnnotation(Menu.class); writer.println(" " + menu.name() + ""); } diff --git a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/HomePageHandler.java b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/HomePageHandler.java index 605d36271f..92643ebe67 100644 --- a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/HomePageHandler.java +++ b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/HomePageHandler.java @@ -18,7 +18,7 @@ package com.alibaba.dubbo.container.page.pages; import java.util.ArrayList; import java.util.List; -import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.ExtensionLoader; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.container.page.Menu; import com.alibaba.dubbo.container.page.Page; @@ -31,13 +31,12 @@ import com.alibaba.dubbo.container.page.PageServlet; * @author william.liangf */ @Menu(name = "Home", desc = "Home page.", order = Integer.MIN_VALUE) -@Extension("index") public class HomePageHandler implements PageHandler { public Page handle(URL url) { List> rows = new ArrayList>(); for (PageHandler handler : PageServlet.getInstance().getMenus()) { - String uri = handler.getClass().getAnnotation(Extension.class).value(); + String uri = ExtensionLoader.getExtensionLoader(PageHandler.class).getExtensionName(handler); Menu menu = handler.getClass().getAnnotation(Menu.class); List row = new ArrayList(); row.add("" + menu.name() + ""); diff --git a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/LogPageHandler.java b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/LogPageHandler.java index 90d08440b8..8891eb2495 100644 --- a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/LogPageHandler.java +++ b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/LogPageHandler.java @@ -31,7 +31,6 @@ import org.apache.log4j.FileAppender; import org.apache.log4j.Level; import org.apache.log4j.LogManager; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.container.page.Menu; import com.alibaba.dubbo.container.page.Page; @@ -43,7 +42,6 @@ import com.alibaba.dubbo.container.page.PageHandler; * @author william.liangf */ @Menu(name = "Log", desc = "Show system log.", order = Integer.MAX_VALUE - 11000) -@Extension("log") public class LogPageHandler implements PageHandler { private static final int SHOW_LOG_LENGTH = 30000; diff --git a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/StatusPageHandler.java b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/StatusPageHandler.java index 51c924b5d9..46942d4131 100644 --- a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/StatusPageHandler.java +++ b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/StatusPageHandler.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.ExtensionLoader; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.status.Status; @@ -37,7 +36,6 @@ import com.alibaba.dubbo.container.page.PageHandler; * @author william.liangf */ @Menu(name = "Status", desc = "Show system status.", order = Integer.MAX_VALUE - 12000) -@Extension("status") public class StatusPageHandler implements PageHandler { public Page handle(URL url) { diff --git a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/SystemPageHandler.java b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/SystemPageHandler.java index 2a2ae261ff..aa8c45a5df 100644 --- a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/SystemPageHandler.java +++ b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/SystemPageHandler.java @@ -22,7 +22,6 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.Version; import com.alibaba.dubbo.common.utils.NetUtils; @@ -36,7 +35,6 @@ import com.alibaba.dubbo.container.page.PageHandler; * @author william.liangf */ @Menu(name = "System", desc = "Show system environment information.", order = Integer.MAX_VALUE - 10000) -@Extension("system") public class SystemPageHandler implements PageHandler { public Page handle(URL url) { diff --git a/dubbo-container/src/main/java/com/alibaba/dubbo/container/spring/SpringContainer.java b/dubbo-container/src/main/java/com/alibaba/dubbo/container/spring/SpringContainer.java index 2a3e5f37e8..c955259e56 100644 --- a/dubbo-container/src/main/java/com/alibaba/dubbo/container/spring/SpringContainer.java +++ b/dubbo-container/src/main/java/com/alibaba/dubbo/container/spring/SpringContainer.java @@ -17,7 +17,6 @@ package com.alibaba.dubbo.container.spring; import org.springframework.context.support.ClassPathXmlApplicationContext; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; import com.alibaba.dubbo.common.utils.ConfigUtils; @@ -28,7 +27,6 @@ import com.alibaba.dubbo.container.Container; * * @author william.liangf */ -@Extension("spring") public class SpringContainer implements Container { private static final Logger logger = LoggerFactory.getLogger(SpringContainer.class); diff --git a/dubbo-container/src/main/resources/META-INF/services/com.alibaba.dubbo.container.Container b/dubbo-container/src/main/resources/META-INF/services/com.alibaba.dubbo.container.Container index 3db2286fd5..c8252084d2 100644 --- a/dubbo-container/src/main/resources/META-INF/services/com.alibaba.dubbo.container.Container +++ b/dubbo-container/src/main/resources/META-INF/services/com.alibaba.dubbo.container.Container @@ -1,3 +1,3 @@ -com.alibaba.dubbo.container.spring.SpringContainer -com.alibaba.dubbo.container.jetty.JettyContainer -com.alibaba.dubbo.container.log4j.Log4jContainer \ No newline at end of file +spring=com.alibaba.dubbo.container.spring.SpringContainer +jetty=com.alibaba.dubbo.container.jetty.JettyContainer +log4j=com.alibaba.dubbo.container.log4j.Log4jContainer \ No newline at end of file diff --git a/dubbo-container/src/main/resources/META-INF/services/com.alibaba.dubbo.container.page.PageHandler b/dubbo-container/src/main/resources/META-INF/services/com.alibaba.dubbo.container.page.PageHandler index 2b48dc7b0f..f31ff7bd65 100644 --- a/dubbo-container/src/main/resources/META-INF/services/com.alibaba.dubbo.container.page.PageHandler +++ b/dubbo-container/src/main/resources/META-INF/services/com.alibaba.dubbo.container.page.PageHandler @@ -1,4 +1,4 @@ -com.alibaba.dubbo.container.page.pages.HomePageHandler -com.alibaba.dubbo.container.page.pages.StatusPageHandler -com.alibaba.dubbo.container.page.pages.LogPageHandler -com.alibaba.dubbo.container.page.pages.SystemPageHandler \ No newline at end of file +home=com.alibaba.dubbo.container.page.pages.HomePageHandler +status=com.alibaba.dubbo.container.page.pages.StatusPageHandler +log=com.alibaba.dubbo.container.page.pages.LogPageHandler +system=com.alibaba.dubbo.container.page.pages.SystemPageHandler \ No newline at end of file diff --git a/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorFactroy.java b/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorFactroy.java index 88a5a0021e..023894ec7d 100644 --- a/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorFactroy.java +++ b/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorFactroy.java @@ -16,7 +16,6 @@ package com.alibaba.dubbo.monitor.dubbo; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.monitor.Monitor; import com.alibaba.dubbo.monitor.MonitorService; @@ -30,7 +29,6 @@ import com.alibaba.dubbo.rpc.ProxyFactory; * * @author william.liangf */ -@Extension("dubbo") public class DubboMonitorFactroy extends AbstractMonitorFactroy { private Protocol protocol; diff --git a/dubbo-monitor-default/src/main/resources/META-INF/services/com.alibaba.dubbo.monitor.MonitorFactory b/dubbo-monitor-default/src/main/resources/META-INF/services/com.alibaba.dubbo.monitor.MonitorFactory index 94cedc1fcd..25ae258923 100644 --- a/dubbo-monitor-default/src/main/resources/META-INF/services/com.alibaba.dubbo.monitor.MonitorFactory +++ b/dubbo-monitor-default/src/main/resources/META-INF/services/com.alibaba.dubbo.monitor.MonitorFactory @@ -1 +1 @@ -com.alibaba.dubbo.monitor.dubbo.DubboMonitorFactroy \ No newline at end of file +dubbo=com.alibaba.dubbo.monitor.dubbo.DubboMonitorFactroy \ No newline at end of file diff --git a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/RegistryContainer.java b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/RegistryContainer.java index ff7dc326ab..734adf1fbe 100644 --- a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/RegistryContainer.java +++ b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/RegistryContainer.java @@ -25,7 +25,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.ExtensionLoader; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.logger.Logger; @@ -43,7 +42,6 @@ import com.alibaba.dubbo.registry.RegistryFactory; * * @author william.liangf */ -@Extension("registry") public class RegistryContainer implements Container { private static final Logger logger = LoggerFactory.getLogger(RegistryContainer.class); diff --git a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ApplicationsPageHandler.java b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ApplicationsPageHandler.java index 5b12a49a18..69e0687a03 100644 --- a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ApplicationsPageHandler.java +++ b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ApplicationsPageHandler.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.container.page.Menu; import com.alibaba.dubbo.container.page.Page; @@ -32,7 +31,6 @@ import com.alibaba.dubbo.monitor.simple.RegistryContainer; * @author william.liangf */ @Menu(name = "Applications", desc = "Show application dependencies.", order = 1000) -@Extension("applications") public class ApplicationsPageHandler implements PageHandler { public Page handle(URL url) { diff --git a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ChartsPageHandler.java b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ChartsPageHandler.java index 5811e16cb6..5201d44265 100644 --- a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ChartsPageHandler.java +++ b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ChartsPageHandler.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.container.page.Page; import com.alibaba.dubbo.container.page.PageHandler; @@ -33,7 +32,6 @@ import com.alibaba.dubbo.monitor.simple.SimpleMonitorService; * * @author william.liangf */ -@Extension("charts") public class ChartsPageHandler implements PageHandler { public Page handle(URL url) { diff --git a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ConsumersPageHandler.java b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ConsumersPageHandler.java index 59f5fc9ab6..3b237284e3 100644 --- a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ConsumersPageHandler.java +++ b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ConsumersPageHandler.java @@ -18,7 +18,6 @@ package com.alibaba.dubbo.monitor.simple.pages; import java.util.ArrayList; import java.util.List; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.utils.NetUtils; import com.alibaba.dubbo.container.page.Page; @@ -30,7 +29,6 @@ import com.alibaba.dubbo.monitor.simple.RegistryContainer; * * @author william.liangf */ -@Extension("consumers") public class ConsumersPageHandler implements PageHandler { public Page handle(URL url) { diff --git a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/DependenciesPageHandler.java b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/DependenciesPageHandler.java index 76ce9a1d97..103b737058 100644 --- a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/DependenciesPageHandler.java +++ b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/DependenciesPageHandler.java @@ -20,7 +20,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.container.page.Page; import com.alibaba.dubbo.container.page.PageHandler; @@ -31,7 +30,6 @@ import com.alibaba.dubbo.monitor.simple.RegistryContainer; * * @author william.liangf */ -@Extension("dependencies") public class DependenciesPageHandler implements PageHandler { public Page handle(URL url) { diff --git a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/HostsPageHandler.java b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/HostsPageHandler.java index 96d74a4003..d298f9a5b0 100644 --- a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/HostsPageHandler.java +++ b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/HostsPageHandler.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Set; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.utils.NetUtils; import com.alibaba.dubbo.container.page.Menu; @@ -34,7 +33,6 @@ import com.alibaba.dubbo.monitor.simple.RegistryContainer; * @author william.liangf */ @Menu(name = "Hosts", desc = "Show provider and consumer hosts", order = 3000) -@Extension("hosts") public class HostsPageHandler implements PageHandler { public Page handle(URL url) { diff --git a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ProvidersPageHandler.java b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ProvidersPageHandler.java index 783d05cadd..a923a0387f 100644 --- a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ProvidersPageHandler.java +++ b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ProvidersPageHandler.java @@ -18,7 +18,6 @@ package com.alibaba.dubbo.monitor.simple.pages; import java.util.ArrayList; import java.util.List; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.utils.NetUtils; import com.alibaba.dubbo.container.page.Page; @@ -30,7 +29,6 @@ import com.alibaba.dubbo.monitor.simple.RegistryContainer; * * @author william.liangf */ -@Extension("providers") public class ProvidersPageHandler implements PageHandler { public Page handle(URL url) { diff --git a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ServicesPageHandler.java b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ServicesPageHandler.java index a095db7c4c..cc0e589037 100644 --- a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ServicesPageHandler.java +++ b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/ServicesPageHandler.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Set; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.container.page.Menu; import com.alibaba.dubbo.container.page.Page; @@ -33,7 +32,6 @@ import com.alibaba.dubbo.monitor.simple.RegistryContainer; * @author william.liangf */ @Menu(name = "Services", desc = "Show registered services.", order = 2000) -@Extension("services") public class ServicesPageHandler implements PageHandler { public Page handle(URL url) { diff --git a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/StatisticsPageHandler.java b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/StatisticsPageHandler.java index 0e384425f6..d235dd5110 100644 --- a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/StatisticsPageHandler.java +++ b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/StatisticsPageHandler.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.container.page.Page; import com.alibaba.dubbo.container.page.PageHandler; @@ -36,7 +35,6 @@ import com.alibaba.dubbo.monitor.simple.SimpleMonitorService; * * @author william.liangf */ -@Extension("statistics") public class StatisticsPageHandler implements PageHandler { public Page handle(URL url) { diff --git a/dubbo-monitor-simple/src/main/resources/META-INF/services/com.alibaba.dubbo.container.Container b/dubbo-monitor-simple/src/main/resources/META-INF/services/com.alibaba.dubbo.container.Container index 84e385cf8c..139ca0629a 100644 --- a/dubbo-monitor-simple/src/main/resources/META-INF/services/com.alibaba.dubbo.container.Container +++ b/dubbo-monitor-simple/src/main/resources/META-INF/services/com.alibaba.dubbo.container.Container @@ -1 +1 @@ -com.alibaba.dubbo.monitor.simple.RegistryContainer \ No newline at end of file +registry=com.alibaba.dubbo.monitor.simple.RegistryContainer \ No newline at end of file diff --git a/dubbo-monitor-simple/src/main/resources/META-INF/services/com.alibaba.dubbo.container.page.PageHandler b/dubbo-monitor-simple/src/main/resources/META-INF/services/com.alibaba.dubbo.container.page.PageHandler index 30524fa5d6..dcee7e0260 100644 --- a/dubbo-monitor-simple/src/main/resources/META-INF/services/com.alibaba.dubbo.container.page.PageHandler +++ b/dubbo-monitor-simple/src/main/resources/META-INF/services/com.alibaba.dubbo.container.page.PageHandler @@ -1,8 +1,8 @@ -com.alibaba.dubbo.monitor.simple.pages.ServicesPageHandler -com.alibaba.dubbo.monitor.simple.pages.ProvidersPageHandler -com.alibaba.dubbo.monitor.simple.pages.ConsumersPageHandler -com.alibaba.dubbo.monitor.simple.pages.StatisticsPageHandler -com.alibaba.dubbo.monitor.simple.pages.ChartsPageHandler -com.alibaba.dubbo.monitor.simple.pages.ApplicationsPageHandler -com.alibaba.dubbo.monitor.simple.pages.DependenciesPageHandler -com.alibaba.dubbo.monitor.simple.pages.HostsPageHandler \ No newline at end of file +services=com.alibaba.dubbo.monitor.simple.pages.ServicesPageHandler +providers=com.alibaba.dubbo.monitor.simple.pages.ProvidersPageHandler +consumers=com.alibaba.dubbo.monitor.simple.pages.ConsumersPageHandler +statistics=com.alibaba.dubbo.monitor.simple.pages.StatisticsPageHandler +charts=com.alibaba.dubbo.monitor.simple.pages.ChartsPageHandler +applications=com.alibaba.dubbo.monitor.simple.pages.ApplicationsPageHandler +dependencies=com.alibaba.dubbo.monitor.simple.pages.DependenciesPageHandler +hosts=com.alibaba.dubbo.monitor.simple.pages.HostsPageHandler \ No newline at end of file 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 f072bf5afd..c21f91e128 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.Extension; +import com.alibaba.dubbo.common.Default; import com.alibaba.dubbo.common.URL; /** @@ -24,7 +24,7 @@ import com.alibaba.dubbo.common.URL; * * @author william.liangf */ -@Extension("dubbo") +@Default("dubbo") public interface MonitorFactory { /** diff --git a/dubbo-monitor/src/main/java/com/alibaba/dubbo/monitor/support/MonitorFilter.java b/dubbo-monitor/src/main/java/com/alibaba/dubbo/monitor/support/MonitorFilter.java index 4b0fbecbaf..c8e5c45314 100644 --- a/dubbo-monitor/src/main/java/com/alibaba/dubbo/monitor/support/MonitorFilter.java +++ b/dubbo-monitor/src/main/java/com/alibaba/dubbo/monitor/support/MonitorFilter.java @@ -20,7 +20,6 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; @@ -40,7 +39,6 @@ import com.alibaba.dubbo.rpc.RpcException; * * @author william.liangf */ -@Extension("monitor") public class MonitorFilter implements Filter { private static final Logger logger = LoggerFactory.getLogger(MonitorFilter.class); diff --git a/dubbo-monitor/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter b/dubbo-monitor/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter index de66615e39..832b9cdc49 100644 --- a/dubbo-monitor/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter +++ b/dubbo-monitor/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter @@ -1 +1 @@ -com.alibaba.dubbo.monitor.support.MonitorFilter \ No newline at end of file +monitor=com.alibaba.dubbo.monitor.support.MonitorFilter \ No newline at end of file diff --git a/dubbo-registry-default/src/main/java/com/alibaba/dubbo/registry/dubbo/DubboRegistryFactory.java b/dubbo-registry-default/src/main/java/com/alibaba/dubbo/registry/dubbo/DubboRegistryFactory.java index 7d1ef67afb..c370bf2661 100644 --- a/dubbo-registry-default/src/main/java/com/alibaba/dubbo/registry/dubbo/DubboRegistryFactory.java +++ b/dubbo-registry-default/src/main/java/com/alibaba/dubbo/registry/dubbo/DubboRegistryFactory.java @@ -21,7 +21,6 @@ import java.util.HashSet; import java.util.List; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.bytecode.Wrapper; import com.alibaba.dubbo.common.utils.NetUtils; @@ -41,7 +40,6 @@ import com.alibaba.dubbo.rpc.cluster.Cluster; * * @author william.liangf */ -@Extension("dubbo") public class DubboRegistryFactory extends AbstractRegistryFactory { private Protocol protocol; diff --git a/dubbo-registry-default/src/main/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory b/dubbo-registry-default/src/main/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory index 403c36f71c..55d739de33 100644 --- a/dubbo-registry-default/src/main/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory +++ b/dubbo-registry-default/src/main/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory @@ -1 +1 @@ -com.alibaba.dubbo.registry.dubbo.DubboRegistryFactory \ No newline at end of file +dubbo=com.alibaba.dubbo.registry.dubbo.DubboRegistryFactory \ No newline at end of file diff --git a/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryFactory.java b/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryFactory.java index eb065e259a..138c952d6a 100644 --- a/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryFactory.java +++ b/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryFactory.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.registry.multicast; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.registry.Registry; import com.alibaba.dubbo.registry.support.AbstractRegistryFactory; @@ -25,7 +24,6 @@ import com.alibaba.dubbo.registry.support.AbstractRegistryFactory; * * @author william.liangf */ -@Extension("multicast") public class MulticastRegistryFactory extends AbstractRegistryFactory { public Registry createRegistry(URL url) { diff --git a/dubbo-registry-multicast/src/main/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory b/dubbo-registry-multicast/src/main/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory index e37727e195..7eb7b3f38a 100644 --- a/dubbo-registry-multicast/src/main/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory +++ b/dubbo-registry-multicast/src/main/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory @@ -1 +1 @@ -com.alibaba.dubbo.registry.multicast.MulticastRegistryFactory \ No newline at end of file +multicast=com.alibaba.dubbo.registry.multicast.MulticastRegistryFactory \ No newline at end of file diff --git a/dubbo-registry-simple/src/main/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory b/dubbo-registry-simple/src/main/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory deleted file mode 100644 index 403c36f71c..0000000000 --- a/dubbo-registry-simple/src/main/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory +++ /dev/null @@ -1 +0,0 @@ -com.alibaba.dubbo.registry.dubbo.DubboRegistryFactory \ No newline at end of file diff --git a/dubbo-registry-zookeeper/src/main/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistryFactory.java b/dubbo-registry-zookeeper/src/main/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistryFactory.java index cd4daeb261..3151dde24b 100644 --- a/dubbo-registry-zookeeper/src/main/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistryFactory.java +++ b/dubbo-registry-zookeeper/src/main/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistryFactory.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.registry.zookeeper; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.registry.Registry; import com.alibaba.dubbo.registry.support.AbstractRegistryFactory; @@ -25,7 +24,6 @@ import com.alibaba.dubbo.registry.support.AbstractRegistryFactory; * * @author william.liangf */ -@Extension("zookeeper") public class ZookeeperRegistryFactory extends AbstractRegistryFactory { public Registry createRegistry(URL url) { diff --git a/dubbo-registry-zookeeper/src/main/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory b/dubbo-registry-zookeeper/src/main/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory index b538326461..ced9ea0c45 100644 --- a/dubbo-registry-zookeeper/src/main/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory +++ b/dubbo-registry-zookeeper/src/main/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory @@ -1 +1 @@ -com.alibaba.dubbo.registry.zookeeper.ZookeeperRegistryFactory \ No newline at end of file +zookeeper=com.alibaba.dubbo.registry.zookeeper.ZookeeperRegistryFactory \ No newline at end of file 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 2ab1105e31..963d34fe92 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.Extension; +import com.alibaba.dubbo.common.Default; 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 */ -@Extension("dubbo") +@Default("dubbo") public interface RegistryFactory { /** diff --git a/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/pages/RegisteredPageHandler.java b/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/pages/RegisteredPageHandler.java index f56bbd9ad8..7217921d86 100644 --- a/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/pages/RegisteredPageHandler.java +++ b/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/pages/RegisteredPageHandler.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.container.page.Page; import com.alibaba.dubbo.container.page.PageHandler; @@ -33,7 +32,6 @@ import com.alibaba.dubbo.registry.support.AbstractRegistryFactory; * * @author william.liangf */ -@Extension("registered") public class RegisteredPageHandler implements PageHandler { public Page handle(URL url) { diff --git a/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/pages/RegistriesPageHandler.java b/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/pages/RegistriesPageHandler.java index b8948321ca..bfe06ffc74 100644 --- a/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/pages/RegistriesPageHandler.java +++ b/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/pages/RegistriesPageHandler.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.utils.NetUtils; import com.alibaba.dubbo.container.page.Menu; @@ -35,7 +34,6 @@ import com.alibaba.dubbo.registry.support.AbstractRegistryFactory; * @author william.liangf */ @Menu(name = "Registries", desc = "Show connected registries.", order = 10000) -@Extension("registries") public class RegistriesPageHandler implements PageHandler { public Page handle(URL url) { diff --git a/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/pages/SubscribedPageHandler.java b/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/pages/SubscribedPageHandler.java index 6feaa223d3..ef58259a2c 100644 --- a/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/pages/SubscribedPageHandler.java +++ b/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/pages/SubscribedPageHandler.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.container.page.Page; import com.alibaba.dubbo.container.page.PageHandler; @@ -33,7 +32,6 @@ import com.alibaba.dubbo.registry.support.AbstractRegistryFactory; * * @author william.liangf */ -@Extension("subscribed") public class SubscribedPageHandler implements PageHandler { public Page handle(URL url) { diff --git a/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/support/RegistryProtocol.java b/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/support/RegistryProtocol.java index dc2e13787f..49519c970e 100644 --- a/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/support/RegistryProtocol.java +++ b/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/support/RegistryProtocol.java @@ -21,7 +21,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.ExtensionLoader; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.logger.Logger; @@ -46,7 +45,6 @@ import com.alibaba.dubbo.rpc.protocol.InvokerWrapper; * @author william.liangf * @author chao.liuc */ -@Extension(Constants.REGISTRY_PROTOCOL) public class RegistryProtocol implements Protocol { private Cluster cluster; diff --git a/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/support/RegistryStatusChecker.java b/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/support/RegistryStatusChecker.java index b3577b8db2..c96e3a4e7e 100644 --- a/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/support/RegistryStatusChecker.java +++ b/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/support/RegistryStatusChecker.java @@ -17,7 +17,6 @@ package com.alibaba.dubbo.registry.support; import java.util.Collection; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.status.Status; import com.alibaba.dubbo.common.status.StatusChecker; import com.alibaba.dubbo.registry.Registry; @@ -27,7 +26,6 @@ import com.alibaba.dubbo.registry.Registry; * * @author william.liangf */ -@Extension("registry") public class RegistryStatusChecker implements StatusChecker { public Status check() { diff --git a/dubbo-registry/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker b/dubbo-registry/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker index 58920c61f6..b7241be355 100644 --- a/dubbo-registry/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker +++ b/dubbo-registry/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker @@ -1 +1 @@ -com.alibaba.dubbo.registry.support.RegistryStatusChecker \ No newline at end of file +registry=com.alibaba.dubbo.registry.support.RegistryStatusChecker \ No newline at end of file diff --git a/dubbo-registry/src/main/resources/META-INF/services/com.alibaba.dubbo.container.page.PageHandler b/dubbo-registry/src/main/resources/META-INF/services/com.alibaba.dubbo.container.page.PageHandler index 5ac61358e9..8e75ea0504 100644 --- a/dubbo-registry/src/main/resources/META-INF/services/com.alibaba.dubbo.container.page.PageHandler +++ b/dubbo-registry/src/main/resources/META-INF/services/com.alibaba.dubbo.container.page.PageHandler @@ -1,3 +1,3 @@ -com.alibaba.dubbo.registry.pages.RegistriesPageHandler -com.alibaba.dubbo.registry.pages.RegisteredPageHandler -com.alibaba.dubbo.registry.pages.SubscribedPageHandler \ No newline at end of file +registries=com.alibaba.dubbo.registry.pages.RegistriesPageHandler +registered=com.alibaba.dubbo.registry.pages.RegisteredPageHandler +subscribed=com.alibaba.dubbo.registry.pages.SubscribedPageHandler \ No newline at end of file diff --git a/dubbo-registry/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol b/dubbo-registry/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol index c210ed749a..4735fad110 100644 --- a/dubbo-registry/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol +++ b/dubbo-registry/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol @@ -1 +1 @@ -com.alibaba.dubbo.registry.support.RegistryProtocol \ No newline at end of file +registry=com.alibaba.dubbo.registry.support.RegistryProtocol \ No newline at end of file diff --git a/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyTransporter.java b/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyTransporter.java index 1a3e37f6bd..5f66322805 100644 --- a/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyTransporter.java +++ b/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyTransporter.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.remoting.transport.grizzly; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.ChannelHandler; import com.alibaba.dubbo.remoting.Client; @@ -28,7 +27,6 @@ import com.alibaba.dubbo.remoting.Transporter; * * @author william.liangf */ -@Extension(GrizzlyTransporter.NAME) public class GrizzlyTransporter implements Transporter { public static final String NAME = "grizzly"; diff --git a/dubbo-remoting-grizzly/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Transporter b/dubbo-remoting-grizzly/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Transporter index 5ce7f6747b..1cd2509203 100644 --- a/dubbo-remoting-grizzly/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Transporter +++ b/dubbo-remoting-grizzly/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Transporter @@ -1 +1 @@ -com.alibaba.dubbo.remoting.transport.grizzly.GrizzlyTransporter \ No newline at end of file +grizzly=com.alibaba.dubbo.remoting.transport.grizzly.GrizzlyTransporter \ No newline at end of file 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 a7356bbb5c..4d2ad707cf 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.Extension; +import com.alibaba.dubbo.common.Default; import com.alibaba.dubbo.common.URL; /** @@ -25,7 +25,7 @@ import com.alibaba.dubbo.common.URL; * * @author william.liangf */ -@Extension("jetty") +@Default("jetty") public interface HttpBinder { /** diff --git a/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/jetty/JettyHttpBinder.java b/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/jetty/JettyHttpBinder.java index dc67f11b18..4741b90dcd 100644 --- a/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/jetty/JettyHttpBinder.java +++ b/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/jetty/JettyHttpBinder.java @@ -15,18 +15,16 @@ */ package com.alibaba.dubbo.remoting.http.jetty; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.remoting.http.HttpBinder; import com.alibaba.dubbo.remoting.http.HttpHandler; import com.alibaba.dubbo.remoting.http.HttpServer; -import com.alibaba.dubbo.remoting.http.HttpBinder; /** * JettyHttpTransporter * * @author william.liangf */ -@Extension("jetty") public class JettyHttpBinder implements HttpBinder { public HttpServer bind(URL url, HttpHandler handler) { diff --git a/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/ServletHttpBinder.java b/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/ServletHttpBinder.java index ef459ee34a..cc927217a8 100644 --- a/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/ServletHttpBinder.java +++ b/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/ServletHttpBinder.java @@ -16,7 +16,6 @@ package com.alibaba.dubbo.remoting.http.servlet; import com.alibaba.dubbo.common.Adaptive; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.http.HttpBinder; import com.alibaba.dubbo.remoting.http.HttpHandler; @@ -27,7 +26,6 @@ import com.alibaba.dubbo.remoting.http.HttpServer; * * @author william.liangf */ -@Extension("servlet") public class ServletHttpBinder implements HttpBinder { @Adaptive() diff --git a/dubbo-remoting-http/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.http.HttpBinder b/dubbo-remoting-http/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.http.HttpBinder index 46f65c42ed..b1be1077e5 100644 --- a/dubbo-remoting-http/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.http.HttpBinder +++ b/dubbo-remoting-http/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.http.HttpBinder @@ -1,2 +1,2 @@ -com.alibaba.dubbo.remoting.http.servlet.ServletHttpBinder -com.alibaba.dubbo.remoting.http.jetty.JettyHttpBinder \ No newline at end of file +servlet=com.alibaba.dubbo.remoting.http.servlet.ServletHttpBinder +jetty=com.alibaba.dubbo.remoting.http.jetty.JettyHttpBinder \ No newline at end of file diff --git a/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaTransporter.java b/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaTransporter.java index 6b7c18ec93..534f7f3d24 100644 --- a/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaTransporter.java +++ b/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaTransporter.java @@ -15,18 +15,16 @@ */ package com.alibaba.dubbo.remoting.transport.mina; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Client; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.Transporter; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.remoting.ChannelHandler; +import com.alibaba.dubbo.remoting.Client; +import com.alibaba.dubbo.remoting.RemotingException; +import com.alibaba.dubbo.remoting.Server; +import com.alibaba.dubbo.remoting.Transporter; /** * @author ding.lid */ -@Extension(MinaTransporter.NAME) public class MinaTransporter implements Transporter { public static final String NAME = "mina"; diff --git a/dubbo-remoting-mina/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Transporter b/dubbo-remoting-mina/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Transporter index aaaf989957..237b77c5ed 100644 --- a/dubbo-remoting-mina/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Transporter +++ b/dubbo-remoting-mina/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Transporter @@ -1 +1 @@ -com.alibaba.dubbo.remoting.transport.mina.MinaTransporter \ No newline at end of file +mina=com.alibaba.dubbo.remoting.transport.mina.MinaTransporter \ No newline at end of file diff --git a/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyTransporter.java b/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyTransporter.java index 787d73fa8d..f899a6f7d2 100644 --- a/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyTransporter.java +++ b/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyTransporter.java @@ -15,18 +15,16 @@ */ package com.alibaba.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Client; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.Transporter; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.remoting.ChannelHandler; +import com.alibaba.dubbo.remoting.Client; +import com.alibaba.dubbo.remoting.RemotingException; +import com.alibaba.dubbo.remoting.Server; +import com.alibaba.dubbo.remoting.Transporter; /** * @author ding.lid */ -@Extension(NettyTransporter.NAME) public class NettyTransporter implements Transporter { public static final String NAME = "netty"; diff --git a/dubbo-remoting-netty/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Transporter b/dubbo-remoting-netty/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Transporter index d90141b2ff..eb9bcb2882 100644 --- a/dubbo-remoting-netty/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Transporter +++ b/dubbo-remoting-netty/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Transporter @@ -1 +1 @@ -com.alibaba.dubbo.remoting.transport.netty.NettyTransporter \ No newline at end of file +netty=com.alibaba.dubbo.remoting.transport.netty.NettyTransporter \ No newline at end of file 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 c7fafe16c7..b4fae0962b 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,7 +15,7 @@ */ package com.alibaba.dubbo.remoting.p2p; -import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.Default; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.RemotingException; @@ -26,7 +26,7 @@ import com.alibaba.dubbo.remoting.RemotingException; * * @author william.liangf */ -@Extension +@Default 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 a5835ca6ef..256732c2bc 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,7 @@ */ package com.alibaba.dubbo.remoting.p2p.exchange.support; -import com.alibaba.dubbo.common.Extension; +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; @@ -26,7 +26,6 @@ import com.alibaba.dubbo.remoting.p2p.exchange.ExchangeNetworker; * * @author william.liangf */ -@Extension("file") public class FileExchangeNetworker implements ExchangeNetworker { public ExchangeGroup lookup(URL url) throws RemotingException { diff --git a/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/MulticastExchangeNetworker.java b/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/MulticastExchangeNetworker.java index 3cd808e28b..f2345cdb77 100644 --- a/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/MulticastExchangeNetworker.java +++ b/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/MulticastExchangeNetworker.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.remoting.p2p.exchange.support; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.RemotingException; import com.alibaba.dubbo.remoting.p2p.exchange.ExchangeGroup; @@ -26,7 +25,6 @@ import com.alibaba.dubbo.remoting.p2p.exchange.ExchangeNetworker; * * @author william.liangf */ -@Extension("multicast") public class MulticastExchangeNetworker implements ExchangeNetworker { public ExchangeGroup lookup(URL url) throws RemotingException { diff --git a/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/FileNetworker.java b/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/FileNetworker.java index 6998a4a16b..1aa4f8887d 100644 --- a/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/FileNetworker.java +++ b/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/FileNetworker.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.remoting.p2p.support; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.RemotingException; import com.alibaba.dubbo.remoting.p2p.Group; @@ -26,7 +25,6 @@ import com.alibaba.dubbo.remoting.p2p.Networker; * * @author william.liangf */ -@Extension("file") public class FileNetworker implements Networker { public Group lookup(URL url) throws RemotingException { diff --git a/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/MulticastNetworker.java b/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/MulticastNetworker.java index caf2b3f390..4699f77ecc 100644 --- a/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/MulticastNetworker.java +++ b/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/MulticastNetworker.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.remoting.p2p.support; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.RemotingException; import com.alibaba.dubbo.remoting.p2p.Group; @@ -26,7 +25,6 @@ import com.alibaba.dubbo.remoting.p2p.Networker; * * @author william.liangf */ -@Extension("multicast") public class MulticastNetworker implements Networker { public Group lookup(URL url) throws RemotingException { diff --git a/dubbo-remoting-p2p/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.p2p.Networker b/dubbo-remoting-p2p/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.p2p.Networker index cd1e3fc446..521c6c0414 100644 --- a/dubbo-remoting-p2p/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.p2p.Networker +++ b/dubbo-remoting-p2p/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.p2p.Networker @@ -1,2 +1,2 @@ -com.alibaba.dubbo.remoting.p2p.support.MulticastNetworker -com.alibaba.dubbo.remoting.p2p.support.FileNetworker \ No newline at end of file +multicast=com.alibaba.dubbo.remoting.p2p.support.MulticastNetworker +file=com.alibaba.dubbo.remoting.p2p.support.FileNetworker \ No newline at end of file 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 42fd17c9fb..148c79a2b9 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 @@ -17,7 +17,7 @@ package com.alibaba.dubbo.remoting; import com.alibaba.dubbo.common.Adaptive; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.Default; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.transport.handler.DefaultChannelHandlerWrapper; @@ -26,7 +26,7 @@ import com.alibaba.dubbo.remoting.transport.handler.DefaultChannelHandlerWrapper * * @author chao.liuc */ -@Extension(DefaultChannelHandlerWrapper.NAME) +@Default(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 3157650915..ee8acf40d4 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,7 +21,7 @@ import java.io.OutputStream; import com.alibaba.dubbo.common.Adaptive; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.Default; /** * Codec. (SPI, Singleton, ThreadSafe) @@ -30,7 +30,7 @@ import com.alibaba.dubbo.common.Extension; * @author ding.lid * @author william.liangf */ -@Extension +@Default 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 fd37fad868..9d8e980367 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 @@ -17,7 +17,7 @@ package com.alibaba.dubbo.remoting; import com.alibaba.dubbo.common.Adaptive; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.Default; import com.alibaba.dubbo.common.URL; /** @@ -30,7 +30,7 @@ import com.alibaba.dubbo.common.URL; * @author ding.lid * @author william.liangf */ -@Extension("netty") +@Default("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 10ab3ed10a..02afb2344d 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.Extension; +import com.alibaba.dubbo.common.Default; 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 */ -@Extension(HeaderExchanger.NAME) +@Default(HeaderExchanger.NAME) public interface Exchanger { /** diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/codec/ExchangeCodec.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/codec/ExchangeCodec.java index 2477bed586..3ab643dc35 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/codec/ExchangeCodec.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/codec/ExchangeCodec.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.ExtensionLoader; import com.alibaba.dubbo.common.io.Bytes; import com.alibaba.dubbo.common.io.StreamUtils; @@ -47,7 +46,6 @@ import com.alibaba.dubbo.remoting.telnet.codec.TelnetCodec; * @author qianlei * @author william.liangf */ -@Extension("exchange") public class ExchangeCodec extends TelnetCodec { private static final Logger logger = LoggerFactory.getLogger(ExchangeCodec.class); diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchanger.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchanger.java index c1506ade9e..76badec6d8 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchanger.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchanger.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.remoting.exchange.support.header; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.RemotingException; import com.alibaba.dubbo.remoting.Transporters; @@ -29,7 +28,6 @@ import com.alibaba.dubbo.remoting.exchange.Exchanger; * * @author william.liangf */ -@Extension(HeaderExchanger.NAME) public class HeaderExchanger implements Exchanger { public static final String NAME = "header"; 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 cca6c56145..639913b4a6 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,7 +15,7 @@ */ package com.alibaba.dubbo.remoting.telnet; -import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.Default; import com.alibaba.dubbo.remoting.Channel; import com.alibaba.dubbo.remoting.RemotingException; @@ -24,7 +24,7 @@ import com.alibaba.dubbo.remoting.RemotingException; * * @author william.liangf */ -@Extension +@Default public interface TelnetHandler { /** diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/codec/TelnetCodec.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/codec/TelnetCodec.java index baba9add97..9642a5a00d 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/codec/TelnetCodec.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/codec/TelnetCodec.java @@ -26,7 +26,6 @@ import java.util.LinkedList; import java.util.List; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; @@ -43,7 +42,6 @@ import com.alibaba.dubbo.remoting.transport.codec.TransportCodec; * @author william.liangf * @author chao.liuc */ -@Extension("telnet") public class TelnetCodec extends TransportCodec { private static final Logger logger = LoggerFactory.getLogger(TelnetCodec.class); diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/ClearTelnetHandler.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/ClearTelnetHandler.java index a87d0502f9..dda4108c35 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/ClearTelnetHandler.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/ClearTelnetHandler.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.remoting.telnet.support.command; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.utils.StringUtils; import com.alibaba.dubbo.remoting.Channel; import com.alibaba.dubbo.remoting.telnet.TelnetHandler; @@ -27,7 +26,6 @@ import com.alibaba.dubbo.remoting.telnet.support.Help; * @author william.liangf */ @Help(parameter = "[lines]", summary = "Clear screen.", detail = "Clear screen.") -@Extension("clear") public class ClearTelnetHandler implements TelnetHandler { public String telnet(Channel channel, String message) { diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/ExitTelnetHandler.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/ExitTelnetHandler.java index ce933e3ed9..7e9ad5330a 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/ExitTelnetHandler.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/ExitTelnetHandler.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.remoting.telnet.support.command; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.remoting.Channel; import com.alibaba.dubbo.remoting.telnet.TelnetHandler; import com.alibaba.dubbo.remoting.telnet.support.Help; @@ -26,7 +25,6 @@ import com.alibaba.dubbo.remoting.telnet.support.Help; * @author william.liangf */ @Help(parameter = "", summary = "Exit the telnet.", detail = "Exit the telnet.") -@Extension("exit") public class ExitTelnetHandler implements TelnetHandler { public String telnet(Channel channel, String message) { diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/HelpTelnetHandler.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/HelpTelnetHandler.java index 236fe946cb..df24175ce7 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/HelpTelnetHandler.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/HelpTelnetHandler.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.List; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.ExtensionLoader; import com.alibaba.dubbo.common.utils.ConfigUtils; import com.alibaba.dubbo.remoting.Channel; @@ -33,7 +32,6 @@ import com.alibaba.dubbo.remoting.telnet.support.TelnetUtils; * @author william.liangf */ @Help(parameter = "[command]", summary = "Show help.", detail = "Show help.") -@Extension("help") public class HelpTelnetHandler implements TelnetHandler { public String telnet(Channel channel, String message) { diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/LogTelnetHandler.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/LogTelnetHandler.java new file mode 100644 index 0000000000..74ce9898c4 --- /dev/null +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/LogTelnetHandler.java @@ -0,0 +1,92 @@ +/* + * 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.remoting.telnet.support.command; + + +import java.io.File; +import java.io.FileInputStream; +import java.nio.ByteBuffer; +import java.nio.channels.FileChannel; +import java.text.SimpleDateFormat; +import java.util.Date; + +import com.alibaba.dubbo.common.logger.Level; +import com.alibaba.dubbo.common.logger.LoggerFactory; +import com.alibaba.dubbo.common.utils.StringUtils; +import com.alibaba.dubbo.remoting.Channel; +import com.alibaba.dubbo.remoting.telnet.TelnetHandler; +import com.alibaba.dubbo.remoting.telnet.support.Help; + +/** + * LogTelnetHandler + * @author chao.liuc + * + */ +@Help(parameter = "level", summary = "Change log level or show log ", detail = "Change log level or show log") +public class LogTelnetHandler implements TelnetHandler { + + public static final String SERVICE_KEY = "telnet.log"; + + public String telnet(Channel channel, String message) { + long size = 0 ; + File file = LoggerFactory.getFile(); + StringBuffer buf = new StringBuffer(); + if (message == null || message.trim().length() == 0) { + buf.append("EXAMPLE: log error / log 100"); + }else { + String str[] = message.split(" "); + if (! StringUtils.isInteger(str[0])){ + LoggerFactory.setLevel(Level.valueOf(message.toUpperCase())); + } else { + int SHOW_LOG_LENGTH = Integer.parseInt(str[0]); + + if (file != null && file.exists()) { + try{ + FileInputStream fis = new FileInputStream(file); + FileChannel filechannel = fis.getChannel(); + size = filechannel.size(); + ByteBuffer bb; + if (size <= SHOW_LOG_LENGTH) { + bb = ByteBuffer.allocate((int) size); + filechannel.read(bb, 0); + } else { + int pos = (int) (size - SHOW_LOG_LENGTH); + bb = ByteBuffer.allocate(SHOW_LOG_LENGTH); + filechannel.read(bb, pos); + } + bb.flip(); + String content = new String(bb.array()).replace("<", "<") + .replace(">", ">").replace("\n", "

    "); + buf.append("\r\ncontent:"+content); + + buf.append("\r\nmodified:"+(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss") + .format(new Date(file.lastModified())))); + buf.append("\r\nsize:"+size +"\r\n"); + }catch (Exception e) { + buf.append(e.getMessage()); + } + }else { + size = 0; + buf.append("\r\nMESSAGE: log file not exists or log appender is console ."); + } + } + } + buf.append("\r\nCURRENT LOG LEVEL:"+ LoggerFactory.getLevel()) + .append("\r\nCURRENT LOG APPENDER:"+ (file == null ? "console" : file.getAbsolutePath())); + return buf.toString(); + } + +} \ No newline at end of file diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/StatusTelnetHandler.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/StatusTelnetHandler.java index 164db61a08..6851a909c2 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/StatusTelnetHandler.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/StatusTelnetHandler.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.ExtensionLoader; import com.alibaba.dubbo.common.status.Status; import com.alibaba.dubbo.common.status.StatusChecker; @@ -38,7 +37,6 @@ import com.alibaba.dubbo.remoting.telnet.support.TelnetUtils; * @author william.liangf */ @Help(parameter = "[-l]", summary = "Show status.", detail = "Show status.") -@Extension("status") public class StatusTelnetHandler implements TelnetHandler { public String telnet(Channel channel, String message) { diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/codec/TransportCodec.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/codec/TransportCodec.java index 3ac299d3db..86597859bd 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/codec/TransportCodec.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/codec/TransportCodec.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.serialize.ObjectInput; import com.alibaba.dubbo.common.serialize.ObjectOutput; import com.alibaba.dubbo.common.utils.StringUtils; @@ -31,7 +30,6 @@ import com.alibaba.dubbo.remoting.transport.AbstractCodec; * * @author william.liangf */ -@Extension("transport") public class TransportCodec extends AbstractCodec { public void encode(Channel channel, OutputStream output, Object message) throws IOException { diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/ConnectionOrderedChannelHandlerWrapper.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/ConnectionOrderedChannelHandlerWrapper.java index 48c5bef4d3..7e51b4b65f 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/ConnectionOrderedChannelHandlerWrapper.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/ConnectionOrderedChannelHandlerWrapper.java @@ -15,17 +15,15 @@ */ package com.alibaba.dubbo.remoting.transport.handler; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.ChannelHandlerWrapper; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.remoting.ChannelHandler; +import com.alibaba.dubbo.remoting.ChannelHandlerWrapper; /** * connect disconnect 保证顺序. * * @author chao.liuc */ -@Extension(ConnectionOrderedChannelHandlerWrapper.NAME) public class ConnectionOrderedChannelHandlerWrapper implements ChannelHandlerWrapper { public static final String NAME = "connection"; diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/DefaultChannelHandlerWrapper.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/DefaultChannelHandlerWrapper.java index 5d5da8c7b0..298cec787d 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/DefaultChannelHandlerWrapper.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/DefaultChannelHandlerWrapper.java @@ -15,17 +15,15 @@ */ package com.alibaba.dubbo.remoting.transport.handler; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.ChannelHandlerWrapper; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.remoting.ChannelHandler; +import com.alibaba.dubbo.remoting.ChannelHandlerWrapper; /** * 默认的线程池配置 * * @author chao.liuc */ -@Extension(DefaultChannelHandlerWrapper.NAME) public class DefaultChannelHandlerWrapper implements ChannelHandlerWrapper { public static final String NAME = "default"; diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/DirectChannelHandlerWrapper.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/DirectChannelHandlerWrapper.java index 011307f032..87c6e2bcb0 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/DirectChannelHandlerWrapper.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/DirectChannelHandlerWrapper.java @@ -15,17 +15,15 @@ */ package com.alibaba.dubbo.remoting.transport.handler; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.ChannelHandlerWrapper; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.remoting.ChannelHandler; +import com.alibaba.dubbo.remoting.ChannelHandlerWrapper; /** * 不派发线程池。 * * @author chao.liuc */ -@Extension(DirectChannelHandlerWrapper.NAME) public class DirectChannelHandlerWrapper implements ChannelHandlerWrapper { public static final String NAME = "direct"; diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/ExecutionChannelHandlerWrapper.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/ExecutionChannelHandlerWrapper.java index 7877471164..87947008df 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/ExecutionChannelHandlerWrapper.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/ExecutionChannelHandlerWrapper.java @@ -15,17 +15,15 @@ */ package com.alibaba.dubbo.remoting.transport.handler; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.ChannelHandlerWrapper; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.remoting.ChannelHandler; +import com.alibaba.dubbo.remoting.ChannelHandlerWrapper; /** * 除发送全部使用线程池处理 * * @author chao.liuc */ -@Extension(ExecutionChannelHandlerWrapper.NAME) public class ExecutionChannelHandlerWrapper implements ChannelHandlerWrapper { public static final String NAME = "execution"; diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/MessageOnlyChannelHandlerWrapper.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/MessageOnlyChannelHandlerWrapper.java index a6afc89862..3faa95e247 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/MessageOnlyChannelHandlerWrapper.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/handler/MessageOnlyChannelHandlerWrapper.java @@ -15,17 +15,15 @@ */ package com.alibaba.dubbo.remoting.transport.handler; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.ChannelHandlerWrapper; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.remoting.ChannelHandler; +import com.alibaba.dubbo.remoting.ChannelHandlerWrapper; /** * 只有message receive使用线程池. * * @author chao.liuc */ -@Extension(MessageOnlyChannelHandlerWrapper.NAME) public class MessageOnlyChannelHandlerWrapper implements ChannelHandlerWrapper { public static final String NAME = "message"; diff --git a/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.ChannelHandlerWrapper b/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.ChannelHandlerWrapper index bf00c1b964..6489bbf60f 100644 --- a/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.ChannelHandlerWrapper +++ b/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.ChannelHandlerWrapper @@ -1,5 +1,5 @@ -com.alibaba.dubbo.remoting.transport.handler.DefaultChannelHandlerWrapper -com.alibaba.dubbo.remoting.transport.handler.DirectChannelHandlerWrapper -com.alibaba.dubbo.remoting.transport.handler.ExecutionChannelHandlerWrapper -com.alibaba.dubbo.remoting.transport.handler.MessageOnlyChannelHandlerWrapper -com.alibaba.dubbo.remoting.transport.handler.ConnectionOrderedChannelHandlerWrapper \ No newline at end of file +default=com.alibaba.dubbo.remoting.transport.handler.DefaultChannelHandlerWrapper +direct=com.alibaba.dubbo.remoting.transport.handler.DirectChannelHandlerWrapper +execution=com.alibaba.dubbo.remoting.transport.handler.ExecutionChannelHandlerWrapper +message=com.alibaba.dubbo.remoting.transport.handler.MessageOnlyChannelHandlerWrapper +connection=com.alibaba.dubbo.remoting.transport.handler.ConnectionOrderedChannelHandlerWrapper \ No newline at end of file diff --git a/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Codec b/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Codec index bed639d2bd..d72ce444fe 100644 --- a/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Codec +++ b/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Codec @@ -1,3 +1,3 @@ -com.alibaba.dubbo.remoting.transport.codec.TransportCodec -com.alibaba.dubbo.remoting.telnet.codec.TelnetCodec -com.alibaba.dubbo.remoting.exchange.codec.ExchangeCodec \ No newline at end of file +transport=com.alibaba.dubbo.remoting.transport.codec.TransportCodec +telnet=com.alibaba.dubbo.remoting.telnet.codec.TelnetCodec +exchange=com.alibaba.dubbo.remoting.exchange.codec.ExchangeCodec \ No newline at end of file diff --git a/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.exchange.Exchanger b/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.exchange.Exchanger index 6084189450..c07fd67e04 100644 --- a/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.exchange.Exchanger +++ b/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.exchange.Exchanger @@ -1 +1 @@ -com.alibaba.dubbo.remoting.exchange.support.header.HeaderExchanger \ No newline at end of file +header=com.alibaba.dubbo.remoting.exchange.support.header.HeaderExchanger \ No newline at end of file diff --git a/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.p2p.Networker b/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.p2p.Networker deleted file mode 100644 index cd1e3fc446..0000000000 --- a/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.p2p.Networker +++ /dev/null @@ -1,2 +0,0 @@ -com.alibaba.dubbo.remoting.p2p.support.MulticastNetworker -com.alibaba.dubbo.remoting.p2p.support.FileNetworker \ No newline at end of file diff --git a/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.telnet.TelnetHandler b/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.telnet.TelnetHandler index cc16268195..c56ce82a8c 100644 --- a/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.telnet.TelnetHandler +++ b/dubbo-remoting/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.telnet.TelnetHandler @@ -1,4 +1,5 @@ -com.alibaba.dubbo.remoting.telnet.support.command.ClearTelnetHandler -com.alibaba.dubbo.remoting.telnet.support.command.ExitTelnetHandler -com.alibaba.dubbo.remoting.telnet.support.command.HelpTelnetHandler -com.alibaba.dubbo.remoting.telnet.support.command.StatusTelnetHandler \ No newline at end of file +clear=com.alibaba.dubbo.remoting.telnet.support.command.ClearTelnetHandler +exit=com.alibaba.dubbo.remoting.telnet.support.command.ExitTelnetHandler +help=com.alibaba.dubbo.remoting.telnet.support.command.HelpTelnetHandler +status=com.alibaba.dubbo.remoting.telnet.support.command.StatusTelnetHandler +log=com.alibaba.dubbo.remoting.telnet.support.command.LogTelnetHandler \ No newline at end of file diff --git a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboCodec.java b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboCodec.java index ef248ba911..7e014c4720 100644 --- a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboCodec.java +++ b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboCodec.java @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.Map; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.Version; import com.alibaba.dubbo.common.serialize.ObjectInput; import com.alibaba.dubbo.common.serialize.ObjectOutput; @@ -45,7 +44,6 @@ import com.alibaba.dubbo.rpc.support.RpcUtils; * @author qianlei * @author chao.liuc */ -@Extension(value=DubboCodec.NAME) public class DubboCodec extends ExchangeCodec implements Codec { public static final String NAME = "dubbo"; diff --git a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java index 2527f8ba8a..ee1fb11bb2 100644 --- a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java +++ b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java @@ -26,7 +26,6 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.locks.ReentrantLock; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.ExtensionLoader; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.Version; @@ -58,7 +57,6 @@ import com.alibaba.dubbo.rpc.protocol.AbstractProtocol; * @author william.liangf * @author chao.liuc */ -@Extension(DubboProtocol.NAME) public class DubboProtocol extends AbstractProtocol { public static final String NAME = "dubbo"; diff --git a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java index 8de2140f83..aff4411e6e 100644 --- a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java +++ b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java @@ -20,7 +20,6 @@ import java.lang.reflect.Method; import java.util.concurrent.Future; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; import com.alibaba.dubbo.remoting.exchange.ResponseCallback; @@ -40,7 +39,6 @@ import com.alibaba.dubbo.rpc.protocol.dubbo.FutureAdapter; * @author chao.liuc * @author william.liangf */ -@Extension("future") public class FutureFilter implements Filter { protected static final Logger logger = LoggerFactory.getLogger(FutureFilter.class); diff --git a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/TraceFilter.java b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/TraceFilter.java index 66f47be60c..9909927349 100644 --- a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/TraceFilter.java +++ b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/TraceFilter.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.json.JSON; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; @@ -39,7 +38,6 @@ import com.alibaba.dubbo.rpc.RpcException; * * @author william.liangf */ -@Extension("trace") public class TraceFilter implements Filter { private static final Logger logger = LoggerFactory.getLogger(TraceFilter.class); diff --git a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/page/ClientsPageHandler.java b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/page/ClientsPageHandler.java index ff64e6c3fb..dd04d078e5 100644 --- a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/page/ClientsPageHandler.java +++ b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/page/ClientsPageHandler.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.utils.NetUtils; import com.alibaba.dubbo.container.page.Page; @@ -33,7 +32,6 @@ import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; * * @author william.liangf */ -@Extension("clients") public class ClientsPageHandler implements PageHandler { public Page handle(URL url) { diff --git a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/page/ServersPageHandler.java b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/page/ServersPageHandler.java index 651d546446..a02f506b8c 100644 --- a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/page/ServersPageHandler.java +++ b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/page/ServersPageHandler.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.utils.NetUtils; import com.alibaba.dubbo.container.page.Menu; @@ -34,7 +33,6 @@ import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; * @author william.liangf */ @Menu(name = "Servers", desc="Show exported service servers.", order = 14000) -@Extension("servers") public class ServersPageHandler implements PageHandler { public Page handle(URL url) { diff --git a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/status/ServerStatusChecker.java b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/status/ServerStatusChecker.java index b69ad3fd7e..080d6d43bb 100644 --- a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/status/ServerStatusChecker.java +++ b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/status/ServerStatusChecker.java @@ -17,7 +17,6 @@ package com.alibaba.dubbo.rpc.protocol.dubbo.status; import java.util.Collection; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.status.Status; import com.alibaba.dubbo.common.status.StatusChecker; import com.alibaba.dubbo.remoting.exchange.ExchangeServer; @@ -28,7 +27,6 @@ import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; * * @author william.liangf */ -@Extension("server") public class ServerStatusChecker implements StatusChecker { public Status check() { diff --git a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/status/ThreadPoolStatusChecker.java b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/status/ThreadPoolStatusChecker.java index 7c806439af..3de895e868 100644 --- a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/status/ThreadPoolStatusChecker.java +++ b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/status/ThreadPoolStatusChecker.java @@ -19,7 +19,6 @@ import java.util.Collection; import java.util.concurrent.Executor; import java.util.concurrent.ThreadPoolExecutor; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.status.Status; import com.alibaba.dubbo.common.status.StatusChecker; import com.alibaba.dubbo.remoting.ChannelHandler; @@ -34,7 +33,6 @@ import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; * * @author william.liangf */ -@Extension("threadpool") public class ThreadPoolStatusChecker implements StatusChecker { public Status check() { diff --git a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandler.java b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandler.java index 0394f2c4b7..7fd9257456 100644 --- a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandler.java +++ b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandler.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.remoting.Channel; import com.alibaba.dubbo.remoting.telnet.TelnetHandler; import com.alibaba.dubbo.remoting.telnet.support.Help; @@ -28,7 +27,6 @@ import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; * @author william.liangf */ @Help(parameter = "[service]", summary = "Change default service.", detail = "Change default service.") -@Extension("cd") public class ChangeTelnetHandler implements TelnetHandler { public static final String SERVICE_KEY = "telnet.service"; diff --git a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CountTelnetHandler.java b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CountTelnetHandler.java index 27d8a46ee9..9f08ae411e 100644 --- a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CountTelnetHandler.java +++ b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CountTelnetHandler.java @@ -19,7 +19,6 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.utils.StringUtils; import com.alibaba.dubbo.remoting.Channel; @@ -38,7 +37,6 @@ import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; * @author william.liangf */ @Help(parameter = "[service] [method] [times]", summary = "Count the service.", detail = "Count the service.") -@Extension("count") public class CountTelnetHandler implements TelnetHandler { public String telnet(final Channel channel, String message) { diff --git a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandler.java b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandler.java index b81b82c9c1..76cdc98285 100644 --- a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandler.java +++ b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandler.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.remoting.Channel; import com.alibaba.dubbo.remoting.telnet.TelnetHandler; import com.alibaba.dubbo.remoting.telnet.support.Help; @@ -26,7 +25,6 @@ import com.alibaba.dubbo.remoting.telnet.support.Help; * @author william.liangf */ @Help(parameter = "", summary = "Print working default service.", detail = "Print working default service.") -@Extension("pwd") public class CurrentTelnetHandler implements TelnetHandler { public String telnet(Channel channel, String message) { diff --git a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java index 1d3ca1d517..83c8325dab 100644 --- a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java +++ b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java @@ -18,7 +18,6 @@ package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; import java.lang.reflect.Method; import java.util.List; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.json.JSON; import com.alibaba.dubbo.common.utils.PojoUtils; import com.alibaba.dubbo.common.utils.ReflectUtils; @@ -38,7 +37,6 @@ import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; * @author william.liangf */ @Help(parameter = "[service.]method(args)", summary = "Invoke the service method.", detail = "Invoke the service method.") -@Extension("invoke") public class InvokeTelnetHandler implements TelnetHandler { @SuppressWarnings("unchecked") diff --git a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandler.java b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandler.java index 28c0ada8e4..6ba390a429 100644 --- a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandler.java +++ b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandler.java @@ -17,7 +17,6 @@ package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; import java.lang.reflect.Method; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.utils.ReflectUtils; import com.alibaba.dubbo.remoting.Channel; import com.alibaba.dubbo.remoting.telnet.TelnetHandler; @@ -32,7 +31,6 @@ import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; * @author william.liangf */ @Help(parameter = "[-l] [service]", summary = "List services and methods.", detail = "List services and methods.") -@Extension("ls") public class ListTelnetHandler implements TelnetHandler { public String telnet(Channel channel, String message) { diff --git a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/LogTelnetHandler.java b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/LogTelnetHandler.java index 37b273d551..4ad5aee7d2 100644 --- a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/LogTelnetHandler.java +++ b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/LogTelnetHandler.java @@ -16,20 +16,19 @@ package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; -import java.io.File; -import java.io.FileInputStream; -import java.nio.ByteBuffer; -import java.nio.channels.FileChannel; -import java.text.SimpleDateFormat; -import java.util.Date; - -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.logger.Level; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.remoting.telnet.support.Help; +import java.io.File; +import java.io.FileInputStream; +import java.nio.ByteBuffer; +import java.nio.channels.FileChannel; +import java.text.SimpleDateFormat; +import java.util.Date; + +import com.alibaba.dubbo.common.logger.Level; +import com.alibaba.dubbo.common.logger.LoggerFactory; +import com.alibaba.dubbo.common.utils.StringUtils; +import com.alibaba.dubbo.remoting.Channel; +import com.alibaba.dubbo.remoting.telnet.TelnetHandler; +import com.alibaba.dubbo.remoting.telnet.support.Help; /** * LogTelnetHandler @@ -37,7 +36,6 @@ import com.alibaba.dubbo.remoting.telnet.support.Help; * */ @Help(parameter = "level", summary = "Change log level or show log ", detail = "Change log level or show log") -@Extension("log") public class LogTelnetHandler implements TelnetHandler { public static final String SERVICE_KEY = "telnet.log"; diff --git a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandler.java b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandler.java index 07433946bf..10aaf59a73 100644 --- a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandler.java +++ b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandler.java @@ -17,7 +17,6 @@ package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; import java.util.Collection; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.utils.StringUtils; import com.alibaba.dubbo.remoting.Channel; import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; @@ -32,7 +31,6 @@ import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; * @author william.liangf */ @Help(parameter = "[-l] [port]", summary = "Print server ports and connections.", detail = "Print server ports and connections.") -@Extension("ps") public class PortTelnetHandler implements TelnetHandler { public String telnet(Channel channel, String message) { diff --git a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/TraceTelnetHandler.java b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/TraceTelnetHandler.java index af6a291ae1..970e7e224a 100644 --- a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/TraceTelnetHandler.java +++ b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/TraceTelnetHandler.java @@ -17,7 +17,6 @@ package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; import java.lang.reflect.Method; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.utils.StringUtils; import com.alibaba.dubbo.remoting.Channel; import com.alibaba.dubbo.remoting.telnet.TelnetHandler; @@ -33,7 +32,6 @@ import com.alibaba.dubbo.rpc.protocol.dubbo.filter.TraceFilter; * @author william.liangf */ @Help(parameter = "[service] [method] [times]", summary = "Trace the service.", detail = "Trace the service.") -@Extension("trace") public class TraceTelnetHandler implements TelnetHandler { public String telnet(Channel channel, String message) { diff --git a/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker b/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker index 0dd9b93034..2729db5122 100644 --- a/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker +++ b/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker @@ -1,2 +1,2 @@ -com.alibaba.dubbo.rpc.protocol.dubbo.status.ServerStatusChecker -com.alibaba.dubbo.rpc.protocol.dubbo.status.ThreadPoolStatusChecker \ No newline at end of file +server=com.alibaba.dubbo.rpc.protocol.dubbo.status.ServerStatusChecker +threadpool=com.alibaba.dubbo.rpc.protocol.dubbo.status.ThreadPoolStatusChecker \ No newline at end of file diff --git a/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.container.page.PageHandler b/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.container.page.PageHandler index e3245bca30..63122b4182 100644 --- a/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.container.page.PageHandler +++ b/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.container.page.PageHandler @@ -1,2 +1,2 @@ -com.alibaba.dubbo.rpc.protocol.dubbo.page.ServersPageHandler -com.alibaba.dubbo.rpc.protocol.dubbo.page.ClientsPageHandler \ No newline at end of file +servers=com.alibaba.dubbo.rpc.protocol.dubbo.page.ServersPageHandler +clients=com.alibaba.dubbo.rpc.protocol.dubbo.page.ClientsPageHandler \ No newline at end of file diff --git a/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Codec b/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Codec new file mode 100644 index 0000000000..3c6a1b41ac --- /dev/null +++ b/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Codec @@ -0,0 +1 @@ +dubbo=com.alibaba.dubbo.rpc.protocol.dubbo.DubboCodec \ No newline at end of file diff --git a/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.telnet.TelnetHandler b/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.telnet.TelnetHandler new file mode 100644 index 0000000000..780deef718 --- /dev/null +++ b/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.telnet.TelnetHandler @@ -0,0 +1,7 @@ +ls=com.alibaba.dubbo.rpc.protocol.dubbo.telnet.ListTelnetHandler +ps=com.alibaba.dubbo.rpc.protocol.dubbo.telnet.PortTelnetHandler +cd=com.alibaba.dubbo.rpc.protocol.dubbo.telnet.ChangeTelnetHandler +pwd=com.alibaba.dubbo.rpc.protocol.dubbo.telnet.CurrentTelnetHandler +invoke=com.alibaba.dubbo.rpc.protocol.dubbo.telnet.InvokeTelnetHandler +trace=com.alibaba.dubbo.rpc.protocol.dubbo.telnet.TraceTelnetHandler +count=com.alibaba.dubbo.rpc.protocol.dubbo.telnet.CountTelnetHandler \ No newline at end of file diff --git a/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter b/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter index 89488e526e..ff24401f70 100644 --- a/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter +++ b/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter @@ -1,2 +1,2 @@ -com.alibaba.dubbo.rpc.protocol.dubbo.filter.TraceFilter -com.alibaba.dubbo.rpc.protocol.dubbo.filter.FutureFilter \ No newline at end of file +trace=com.alibaba.dubbo.rpc.protocol.dubbo.filter.TraceFilter +future=com.alibaba.dubbo.rpc.protocol.dubbo.filter.FutureFilter \ No newline at end of file diff --git a/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol b/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol index b415e0fe73..6725d68521 100644 --- a/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol +++ b/dubbo-rpc-default/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol @@ -1 +1 @@ -com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol \ No newline at end of file +dubbo=com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol \ No newline at end of file diff --git a/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianProtocol.java b/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianProtocol.java index b5b53b45db..87beb4fc58 100644 --- a/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianProtocol.java +++ b/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianProtocol.java @@ -24,7 +24,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.http.HttpBinder; import com.alibaba.dubbo.remoting.http.HttpHandler; @@ -40,7 +39,6 @@ import com.alibaba.dubbo.rpc.protocol.AbstractProtocol; * * @author qianlei */ -@Extension("hessian") public class HessianProtocol extends AbstractProtocol { private final Map serverMap = new ConcurrentHashMap(); diff --git a/dubbo-rpc-hessian/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol b/dubbo-rpc-hessian/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol index 9b80f39629..2738fa9091 100644 --- a/dubbo-rpc-hessian/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol +++ b/dubbo-rpc-hessian/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol @@ -1 +1 @@ -com.alibaba.dubbo.rpc.protocol.hessian.HessianProtocol \ No newline at end of file +hessian=com.alibaba.dubbo.rpc.protocol.hessian.HessianProtocol \ No newline at end of file diff --git a/dubbo-rpc-injvm/src/main/java/com/alibaba/dubbo/rpc/protocol/injvm/InjvmProtocol.java b/dubbo-rpc-injvm/src/main/java/com/alibaba/dubbo/rpc/protocol/injvm/InjvmProtocol.java index a3e81392f6..c821639755 100644 --- a/dubbo-rpc-injvm/src/main/java/com/alibaba/dubbo/rpc/protocol/injvm/InjvmProtocol.java +++ b/dubbo-rpc-injvm/src/main/java/com/alibaba/dubbo/rpc/protocol/injvm/InjvmProtocol.java @@ -15,7 +15,6 @@ */ package com.alibaba.dubbo.rpc.protocol.injvm; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.rpc.Exporter; import com.alibaba.dubbo.rpc.Invoker; @@ -29,7 +28,6 @@ import com.alibaba.dubbo.rpc.protocol.AbstractProtocol; * @author qian.lei * @author william.liangf */ -@Extension(InjvmProtocol.NAME) public class InjvmProtocol extends AbstractProtocol implements Protocol { public static final String NAME = "injvm"; diff --git a/dubbo-rpc-injvm/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol b/dubbo-rpc-injvm/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol index 2b9dc61670..09a526cc0f 100644 --- a/dubbo-rpc-injvm/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol +++ b/dubbo-rpc-injvm/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol @@ -1 +1 @@ -com.alibaba.dubbo.rpc.protocol.injvm.InjvmProtocol \ No newline at end of file +injvm=com.alibaba.dubbo.rpc.protocol.injvm.InjvmProtocol \ No newline at end of file diff --git a/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiProtocol.java b/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiProtocol.java index 284228cf29..9182e7317f 100644 --- a/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiProtocol.java +++ b/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiProtocol.java @@ -39,7 +39,6 @@ import org.springframework.remoting.RemoteAccessException; import org.springframework.remoting.rmi.RmiProxyFactoryBean; import org.springframework.remoting.rmi.RmiServiceExporter; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.bytecode.ClassGenerator; import com.alibaba.dubbo.rpc.Exporter; @@ -56,7 +55,6 @@ import com.alibaba.dubbo.rpc.protocol.AbstractProtocol; * * @author qian.lei */ -@Extension("rmi") public class RmiProtocol extends AbstractProtocol { public static final int DEFAULT_PORT = 1099; diff --git a/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/DubboRmiProxyFactory.java b/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/DubboRmiProxyFactory.java index f373a01f98..6b7a75544d 100644 --- a/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/DubboRmiProxyFactory.java +++ b/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/DubboRmiProxyFactory.java @@ -27,7 +27,6 @@ import javassist.CtClass; import javassist.CtNewMethod; import javassist.NotFoundException; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.bytecode.ClassGenerator; import com.alibaba.dubbo.rpc.Invocation; @@ -43,7 +42,6 @@ import com.alibaba.dubbo.rpc.protocol.rmi.RmiProxyFactory; * * @author william.liangf */ -@Extension("dubbo") public class DubboRmiProxyFactory implements RmiProxyFactory { private ProxyFactory proxyFactory; diff --git a/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/NativeProxyFactory.java b/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/NativeProxyFactory.java index 9150298404..a4612a215b 100644 --- a/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/NativeProxyFactory.java +++ b/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/NativeProxyFactory.java @@ -19,7 +19,6 @@ import java.rmi.Remote; import java.rmi.server.RemoteServer; import java.rmi.server.ServerNotActiveException; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.rpc.Invocation; import com.alibaba.dubbo.rpc.Invoker; @@ -34,7 +33,6 @@ import com.alibaba.dubbo.rpc.protocol.rmi.RmiProxyFactory; * * @author william.liangf */ -@Extension("native") public class NativeProxyFactory implements RmiProxyFactory { private ProxyFactory proxyFactory; diff --git a/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/SpringRmiProxyFactory.java b/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/SpringRmiProxyFactory.java index 0f6556b170..c6f624638d 100644 --- a/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/SpringRmiProxyFactory.java +++ b/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/SpringRmiProxyFactory.java @@ -24,7 +24,6 @@ import java.rmi.server.ServerNotActiveException; import org.springframework.remoting.rmi.RmiInvocationHandler; import org.springframework.remoting.support.RemoteInvocation; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.utils.ReflectUtils; import com.alibaba.dubbo.common.utils.StringUtils; @@ -42,7 +41,6 @@ import com.alibaba.dubbo.rpc.protocol.rmi.RmiProxyFactory; * * @author william.liangf */ -@Extension("spring") public class SpringRmiProxyFactory implements RmiProxyFactory { public boolean isSupported(Remote remote, Class serviceType, URL url) { diff --git a/dubbo-rpc-rmi/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol b/dubbo-rpc-rmi/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol index 62809e8978..71466d90ec 100644 --- a/dubbo-rpc-rmi/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol +++ b/dubbo-rpc-rmi/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol @@ -1 +1 @@ -com.alibaba.dubbo.rpc.protocol.rmi.RmiProtocol \ No newline at end of file +rmi=com.alibaba.dubbo.rpc.protocol.rmi.RmiProtocol \ No newline at end of file diff --git a/dubbo-rpc-rmi/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.protocol.rmi.RmiProxyFactory b/dubbo-rpc-rmi/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.protocol.rmi.RmiProxyFactory index 2c2b9fc98c..103075e64d 100644 --- a/dubbo-rpc-rmi/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.protocol.rmi.RmiProxyFactory +++ b/dubbo-rpc-rmi/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.protocol.rmi.RmiProxyFactory @@ -1,4 +1,4 @@ -com.alibaba.dubbo.rpc.protocol.rmi.proxy.RmiProxyFactoryAdaptive -com.alibaba.dubbo.rpc.protocol.rmi.proxy.NativeProxyFactory -com.alibaba.dubbo.rpc.protocol.rmi.proxy.DubboRmiProxyFactory -com.alibaba.dubbo.rpc.protocol.rmi.proxy.SpringRmiProxyFactory +adaptive=com.alibaba.dubbo.rpc.protocol.rmi.proxy.RmiProxyFactoryAdaptive +native=com.alibaba.dubbo.rpc.protocol.rmi.proxy.NativeProxyFactory +dubbo=com.alibaba.dubbo.rpc.protocol.rmi.proxy.DubboRmiProxyFactory +spring=com.alibaba.dubbo.rpc.protocol.rmi.proxy.SpringRmiProxyFactory 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 2a0573f714..32b37fbec3 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,14 +15,14 @@ */ package com.alibaba.dubbo.rpc; -import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.Default; /** * Filter. (SPI, Singleton, ThreadSafe) * * @author william.liangf */ -@Extension +@Default 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 2be31ce45e..b3a2af156e 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,7 +15,7 @@ */ package com.alibaba.dubbo.rpc; -import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.Default; import com.alibaba.dubbo.common.URL; /** @@ -23,7 +23,7 @@ import com.alibaba.dubbo.common.URL; * * @author william.liangf */ -@Extension +@Default 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 2158bd3209..b8ed9c14ee 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 @@ -16,7 +16,7 @@ package com.alibaba.dubbo.rpc; import com.alibaba.dubbo.common.Adaptive; -import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.Default; import com.alibaba.dubbo.common.URL; /** @@ -24,7 +24,7 @@ import com.alibaba.dubbo.common.URL; * * @author william.liangf */ -@Extension("dubbo") +@Default("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 edcdc628c8..b0a3e128bb 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 @@ -17,7 +17,7 @@ package com.alibaba.dubbo.rpc; import com.alibaba.dubbo.common.Adaptive; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; +import com.alibaba.dubbo.common.Default; import com.alibaba.dubbo.common.URL; /** @@ -25,7 +25,7 @@ import com.alibaba.dubbo.common.URL; * * @author william.liangf */ -@Extension("javassist") +@Default("javassist") public interface ProxyFactory { /** diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/AccessLogFilter.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/AccessLogFilter.java index a6ea17401b..759db400a4 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/AccessLogFilter.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/AccessLogFilter.java @@ -15,33 +15,32 @@ */ package com.alibaba.dubbo.rpc.filter; -import java.io.File; -import java.io.FileWriter; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; - -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.json.JSON; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ConcurrentHashSet; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Result; +import java.io.File; +import java.io.FileWriter; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; + +import com.alibaba.dubbo.common.Constants; +import com.alibaba.dubbo.common.json.JSON; +import com.alibaba.dubbo.common.logger.Logger; +import com.alibaba.dubbo.common.logger.LoggerFactory; +import com.alibaba.dubbo.common.utils.ConcurrentHashSet; +import com.alibaba.dubbo.common.utils.ConfigUtils; +import com.alibaba.dubbo.common.utils.NamedThreadFactory; +import com.alibaba.dubbo.rpc.Filter; +import com.alibaba.dubbo.rpc.Invocation; +import com.alibaba.dubbo.rpc.Invoker; +import com.alibaba.dubbo.rpc.Result; +import com.alibaba.dubbo.rpc.RpcContext; +import com.alibaba.dubbo.rpc.RpcException; /** * 记录Service的Access Log。 @@ -58,7 +57,6 @@ import com.alibaba.dubbo.rpc.Result; * * @author ding.lid */ -@Extension("accesslog") public class AccessLogFilter implements Filter { private static final Logger logger = LoggerFactory.getLogger(AccessLogFilter.class); diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ActiveLimitFilter.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ActiveLimitFilter.java index f3c86bdf8a..915a09115e 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ActiveLimitFilter.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ActiveLimitFilter.java @@ -16,7 +16,6 @@ package com.alibaba.dubbo.rpc.filter; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.rpc.Filter; import com.alibaba.dubbo.rpc.Invocation; @@ -30,7 +29,6 @@ import com.alibaba.dubbo.rpc.RpcStatus; * * @author william.liangf */ -@Extension("activelimit") public class ActiveLimitFilter implements Filter { public Result invoke(Invoker invoker, Invocation invocation) throws RpcException { diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ClassLoaderFilter.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ClassLoaderFilter.java index f5b9a90033..bc5eed147d 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ClassLoaderFilter.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ClassLoaderFilter.java @@ -15,19 +15,17 @@ */ package com.alibaba.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.Invocation; +import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.Result; +import com.alibaba.dubbo.rpc.RpcException; /** * ClassLoaderInvokerFilter * * @author william.liangf */ -@Extension("classloader") public class ClassLoaderFilter implements Filter { public Result invoke(Invoker invoker, Invocation invocation) throws RpcException { diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/CompatibleFilter.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/CompatibleFilter.java index 278591ff99..f5995bf4bb 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/CompatibleFilter.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/CompatibleFilter.java @@ -19,7 +19,6 @@ import java.lang.reflect.Method; import java.lang.reflect.Type; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; import com.alibaba.dubbo.common.utils.CompatibleTypeUtils; @@ -36,7 +35,6 @@ import com.alibaba.dubbo.rpc.RpcResult; * * @author william.liangf */ -@Extension("compatible") public class CompatibleFilter implements Filter { private static Logger logger = LoggerFactory.getLogger(CompatibleFilter.class); diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ConsumerContextFilter.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ConsumerContextFilter.java index 935a5cb4d8..c866428441 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ConsumerContextFilter.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ConsumerContextFilter.java @@ -15,14 +15,13 @@ */ package com.alibaba.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.utils.NetUtils; import com.alibaba.dubbo.rpc.Filter; +import com.alibaba.dubbo.rpc.Invocation; import com.alibaba.dubbo.rpc.Invoker; +import com.alibaba.dubbo.rpc.Result; import com.alibaba.dubbo.rpc.RpcContext; import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Result; import com.alibaba.dubbo.rpc.RpcInvocation; /** @@ -30,7 +29,6 @@ import com.alibaba.dubbo.rpc.RpcInvocation; * * @author william.liangf */ -@Extension("consumercontext") public class ConsumerContextFilter implements Filter { public Result invoke(Invoker invoker, Invocation invocation) throws RpcException { diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ContextFilter.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ContextFilter.java index 55837d2d20..9ec4494d78 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ContextFilter.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ContextFilter.java @@ -19,7 +19,6 @@ import java.util.HashMap; import java.util.Map; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.rpc.Filter; import com.alibaba.dubbo.rpc.Invocation; import com.alibaba.dubbo.rpc.Invoker; @@ -33,7 +32,6 @@ import com.alibaba.dubbo.rpc.RpcInvocation; * * @author william.liangf */ -@Extension("context") public class ContextFilter implements Filter { public Result invoke(Invoker invoker, Invocation invocation) throws RpcException { diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/DeprecatedFilter.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/DeprecatedFilter.java index f61cda8a00..849720169b 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/DeprecatedFilter.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/DeprecatedFilter.java @@ -18,22 +18,20 @@ package com.alibaba.dubbo.rpc.filter; import java.util.Set; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; import com.alibaba.dubbo.common.utils.ConcurrentHashSet; import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.Invocation; +import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.Result; +import com.alibaba.dubbo.rpc.RpcException; /** * DeprecatedInvokerFilter * * @author william.liangf */ -@Extension("deprecated") public class DeprecatedFilter implements Filter { private static final Logger LOGGER = LoggerFactory.getLogger(DeprecatedFilter.class); diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/EchoFilter.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/EchoFilter.java index 83fb1a1981..93590b6ea1 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/EchoFilter.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/EchoFilter.java @@ -16,12 +16,11 @@ package com.alibaba.dubbo.rpc.filter; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.Invocation; +import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.Result; +import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.RpcResult; /** @@ -29,7 +28,6 @@ import com.alibaba.dubbo.rpc.RpcResult; * * @author william.liangf */ -@Extension("echo") public class EchoFilter implements Filter { public Result invoke(Invoker invoker, Invocation inv) throws RpcException { diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ExceptionFilter.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ExceptionFilter.java index 0a5de6fe1d..61552435ee 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ExceptionFilter.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ExceptionFilter.java @@ -17,16 +17,15 @@ package com.alibaba.dubbo.rpc.filter; import java.lang.reflect.Method; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; import com.alibaba.dubbo.common.utils.ReflectUtils; import com.alibaba.dubbo.common.utils.StringUtils; import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.Invocation; +import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.Result; +import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.RpcResult; import com.alibaba.dubbo.rpc.service.GenericService; @@ -35,7 +34,6 @@ import com.alibaba.dubbo.rpc.service.GenericService; * * @author william.liangf */ -@Extension("exception") public class ExceptionFilter implements Filter { private final Logger logger; diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ExecuteLimitFilter.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ExecuteLimitFilter.java index 30a56d0cdf..def4069327 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ExecuteLimitFilter.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ExecuteLimitFilter.java @@ -16,21 +16,19 @@ package com.alibaba.dubbo.rpc.filter; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcStatus; -import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.Invocation; +import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.Result; +import com.alibaba.dubbo.rpc.RpcException; +import com.alibaba.dubbo.rpc.RpcStatus; /** * ThreadLimitInvokerFilter * * @author william.liangf */ -@Extension("executelimit") public class ExecuteLimitFilter implements Filter { public Result invoke(Invoker invoker, Invocation invocation) throws RpcException { diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/GenericFilter.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/GenericFilter.java index ead9afeb5f..89e68da098 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/GenericFilter.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/GenericFilter.java @@ -15,17 +15,16 @@ */ package com.alibaba.dubbo.rpc.filter; -import java.lang.reflect.Method; - -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.utils.PojoUtils; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Result; +import java.lang.reflect.Method; + +import com.alibaba.dubbo.common.Constants; +import com.alibaba.dubbo.common.utils.PojoUtils; +import com.alibaba.dubbo.common.utils.ReflectUtils; +import com.alibaba.dubbo.rpc.Filter; +import com.alibaba.dubbo.rpc.Invocation; +import com.alibaba.dubbo.rpc.Invoker; +import com.alibaba.dubbo.rpc.Result; +import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.RpcInvocation; import com.alibaba.dubbo.rpc.RpcResult; import com.alibaba.dubbo.rpc.service.GenericException; @@ -35,7 +34,6 @@ import com.alibaba.dubbo.rpc.service.GenericException; * * @author william.liangf */ -@Extension("generic") public class GenericFilter implements Filter { public Result invoke(Invoker invoker, Invocation inv) throws RpcException { diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/GenericImplFilter.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/GenericImplFilter.java index 6033585222..1d1f388777 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/GenericImplFilter.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/GenericImplFilter.java @@ -15,15 +15,14 @@ */ package com.alibaba.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.utils.PojoUtils; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Result; +import com.alibaba.dubbo.common.Constants; +import com.alibaba.dubbo.common.utils.PojoUtils; +import com.alibaba.dubbo.common.utils.ReflectUtils; +import com.alibaba.dubbo.rpc.Filter; +import com.alibaba.dubbo.rpc.Invocation; +import com.alibaba.dubbo.rpc.Invoker; +import com.alibaba.dubbo.rpc.Result; +import com.alibaba.dubbo.rpc.RpcException; import com.alibaba.dubbo.rpc.RpcInvocation; import com.alibaba.dubbo.rpc.RpcResult; @@ -32,7 +31,6 @@ import com.alibaba.dubbo.rpc.RpcResult; * * @author william.liangf */ -@Extension("genericimpl") public class GenericImplFilter implements Filter { private static final Class[] GENERIC_PARAMETER_TYPES = new Class[] {String.class, String[].class, Object[].class}; diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/TimeoutFilter.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/TimeoutFilter.java index 7bfabf9713..38ffb07187 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/TimeoutFilter.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/TimeoutFilter.java @@ -17,21 +17,19 @@ package com.alibaba.dubbo.rpc.filter; import java.util.Arrays; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import com.alibaba.dubbo.common.logger.Logger; +import com.alibaba.dubbo.common.logger.LoggerFactory; +import com.alibaba.dubbo.rpc.Filter; +import com.alibaba.dubbo.rpc.Invocation; +import com.alibaba.dubbo.rpc.Invoker; +import com.alibaba.dubbo.rpc.Result; +import com.alibaba.dubbo.rpc.RpcException; /** * 如果执行timeout，则log记录下，不干涉服务的运行 * * @author chao.liuc */ -@Extension("timeout") public class TimeoutFilter implements Filter { private static final Logger logger = LoggerFactory.getLogger(TimeoutFilter.class); diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/TokenFilter.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/TokenFilter.java index 6d2008cbb3..d14d3a7ae0 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/TokenFilter.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/TokenFilter.java @@ -18,21 +18,19 @@ package com.alibaba.dubbo.rpc.filter; import java.util.Map; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.utils.ConfigUtils; import com.alibaba.dubbo.rpc.Filter; +import com.alibaba.dubbo.rpc.Invocation; import com.alibaba.dubbo.rpc.Invoker; +import com.alibaba.dubbo.rpc.Result; import com.alibaba.dubbo.rpc.RpcContext; import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Result; /** * TokenInvokerFilter * * @author william.liangf */ -@Extension("token") public class TokenFilter implements Filter { public Result invoke(Invoker invoker, Invocation inv) diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/listener/DeprecatedInvokerListener.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/listener/DeprecatedInvokerListener.java index f3a689c2fc..9f780e2b28 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/listener/DeprecatedInvokerListener.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/listener/DeprecatedInvokerListener.java @@ -16,7 +16,6 @@ package com.alibaba.dubbo.rpc.listener; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; import com.alibaba.dubbo.rpc.Invoker; @@ -27,7 +26,6 @@ import com.alibaba.dubbo.rpc.RpcException; * * @author william.liangf */ -@Extension("deprecated") public class DeprecatedInvokerListener extends InvokerListenerAdapter { private static final Logger LOGGER = LoggerFactory.getLogger(DeprecatedInvokerListener.class); diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java index 2101c79ec2..7e776af539 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java @@ -15,21 +15,19 @@ */ package com.alibaba.dubbo.rpc.proxy.javassist; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.bytecode.Proxy; import com.alibaba.dubbo.common.bytecode.Wrapper; import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.proxy.AbstractProxyFactory; -import com.alibaba.dubbo.rpc.proxy.InvokerInvocationHandler; import com.alibaba.dubbo.rpc.proxy.AbstractProxyInvoker; +import com.alibaba.dubbo.rpc.proxy.InvokerInvocationHandler; /** * JavaassistRpcProxyFactory * @author william.liangf */ -@Extension("javassist") public class JavassistProxyFactory extends AbstractProxyFactory { @SuppressWarnings("unchecked") diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/jdk/JdkProxyFactory.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/jdk/JdkProxyFactory.java index dace6c2362..afa805421b 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/jdk/JdkProxyFactory.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/jdk/JdkProxyFactory.java @@ -18,19 +18,17 @@ package com.alibaba.dubbo.rpc.proxy.jdk; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import com.alibaba.dubbo.common.Extension; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.proxy.AbstractProxyFactory; -import com.alibaba.dubbo.rpc.proxy.InvokerInvocationHandler; import com.alibaba.dubbo.rpc.proxy.AbstractProxyInvoker; +import com.alibaba.dubbo.rpc.proxy.InvokerInvocationHandler; /** * JavaassistRpcProxyFactory * @author william.liangf */ -@Extension("jdk") public class JdkProxyFactory extends AbstractProxyFactory { @SuppressWarnings("unchecked") diff --git a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Codec b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Codec deleted file mode 100644 index 5b1044523d..0000000000 --- a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Codec +++ /dev/null @@ -1 +0,0 @@ -com.alibaba.dubbo.rpc.protocol.dubbo.DubboCodec \ No newline at end of file diff --git a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.telnet.TelnetHandler b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.telnet.TelnetHandler deleted file mode 100644 index 6b17325395..0000000000 --- a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.telnet.TelnetHandler +++ /dev/null @@ -1,8 +0,0 @@ -com.alibaba.dubbo.rpc.protocol.dubbo.telnet.ListTelnetHandler -com.alibaba.dubbo.rpc.protocol.dubbo.telnet.ChangeTelnetHandler -com.alibaba.dubbo.rpc.protocol.dubbo.telnet.CurrentTelnetHandler -com.alibaba.dubbo.rpc.protocol.dubbo.telnet.InvokeTelnetHandler -com.alibaba.dubbo.rpc.protocol.dubbo.telnet.TraceTelnetHandler -com.alibaba.dubbo.rpc.protocol.dubbo.telnet.CountTelnetHandler -com.alibaba.dubbo.rpc.protocol.dubbo.telnet.PortTelnetHandler -com.alibaba.dubbo.rpc.protocol.dubbo.telnet.LogTelnetHandler \ No newline at end of file diff --git a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter index a054250636..2689465c24 100644 --- a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter +++ b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter @@ -1,14 +1,14 @@ -com.alibaba.dubbo.rpc.filter.EchoFilter -com.alibaba.dubbo.rpc.filter.GenericFilter -com.alibaba.dubbo.rpc.filter.GenericImplFilter -com.alibaba.dubbo.rpc.filter.TokenFilter -com.alibaba.dubbo.rpc.filter.AccessLogFilter -com.alibaba.dubbo.rpc.filter.ActiveLimitFilter -com.alibaba.dubbo.rpc.filter.ClassLoaderFilter -com.alibaba.dubbo.rpc.filter.ContextFilter -com.alibaba.dubbo.rpc.filter.ConsumerContextFilter -com.alibaba.dubbo.rpc.filter.ExceptionFilter -com.alibaba.dubbo.rpc.filter.ExecuteLimitFilter -com.alibaba.dubbo.rpc.filter.DeprecatedFilter -com.alibaba.dubbo.rpc.filter.CompatibleFilter -com.alibaba.dubbo.rpc.filter.TimeoutFilter \ No newline at end of file +echo=com.alibaba.dubbo.rpc.filter.EchoFilter +generic=com.alibaba.dubbo.rpc.filter.GenericFilter +genericimpl=com.alibaba.dubbo.rpc.filter.GenericImplFilter +token=com.alibaba.dubbo.rpc.filter.TokenFilter +accesslog=com.alibaba.dubbo.rpc.filter.AccessLogFilter +activelimit=com.alibaba.dubbo.rpc.filter.ActiveLimitFilter +classloader=com.alibaba.dubbo.rpc.filter.ClassLoaderFilter +context=com.alibaba.dubbo.rpc.filter.ContextFilter +consumercontext=com.alibaba.dubbo.rpc.filter.ConsumerContextFilter +exception=com.alibaba.dubbo.rpc.filter.ExceptionFilter +executelimit=com.alibaba.dubbo.rpc.filter.ExecuteLimitFilter +deprecated=com.alibaba.dubbo.rpc.filter.DeprecatedFilter +compatible=com.alibaba.dubbo.rpc.filter.CompatibleFilter +timeout=com.alibaba.dubbo.rpc.filter.TimeoutFilter \ No newline at end of file diff --git a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.InvokerListener b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.InvokerListener index 014211c194..6ec09b5370 100644 --- a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.InvokerListener +++ b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.InvokerListener @@ -1 +1 @@ -com.alibaba.dubbo.rpc.listener.DeprecatedInvokerListener \ No newline at end of file +deprecated=com.alibaba.dubbo.rpc.listener.DeprecatedInvokerListener \ No newline at end of file diff --git a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol index 2793819bef..44405f88b1 100644 --- a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol +++ b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol @@ -1,2 +1,2 @@ -com.alibaba.dubbo.rpc.protocol.ProtocolFilterWrapper -com.alibaba.dubbo.rpc.protocol.ProtocolListenerWrapper \ No newline at end of file +filter=com.alibaba.dubbo.rpc.protocol.ProtocolFilterWrapper +listener=com.alibaba.dubbo.rpc.protocol.ProtocolListenerWrapper \ No newline at end of file diff --git a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.ProxyFactory b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.ProxyFactory index 041e1c96cd..49fb66e908 100644 --- a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.ProxyFactory +++ b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.ProxyFactory @@ -1,4 +1,4 @@ -com.alibaba.dubbo.rpc.proxy.wrapper.MockProxyFactoryWrapper -com.alibaba.dubbo.rpc.proxy.wrapper.StubProxyFactoryWrapper -com.alibaba.dubbo.rpc.proxy.jdk.JdkProxyFactory -com.alibaba.dubbo.rpc.proxy.javassist.JavassistProxyFactory \ No newline at end of file +mock=com.alibaba.dubbo.rpc.proxy.wrapper.MockProxyFactoryWrapper +stub=com.alibaba.dubbo.rpc.proxy.wrapper.StubProxyFactoryWrapper +jdk=com.alibaba.dubbo.rpc.proxy.jdk.JdkProxyFactory +javassist=com.alibaba.dubbo.rpc.proxy.javassist.JavassistProxyFactory \ No newline at end of file diff --git a/dubbo-validation/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter b/dubbo-validation/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter index 83f7a055ba..ca2bbe680c 100644 --- a/dubbo-validation/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter +++ b/dubbo-validation/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter @@ -1 +1 @@ -com.alibaba.dubbo.validation.ValidationFilter \ No newline at end of file +validation=com.alibaba.dubbo.validation.ValidationFilter \ No newline at end of file