diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Parameters.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Parameters.java index 138bed244e..fcc39b02d2 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Parameters.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Parameters.java @@ -29,6 +29,7 @@ import com.alibaba.dubbo.common.utils.StringUtils; * 兼容2.0.5之前版本 * @author tony.chenl */ +@Deprecated @Extension public class Parameters { private final Map parameters; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Resetable.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Resetable.java index d8427067be..1ef0985263 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Resetable.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Resetable.java @@ -31,6 +31,4 @@ public interface Resetable { */ void reset(URL url); - void reset(Parameters parameters); - } \ No newline at end of file diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Client.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Client.java index edd2dd99e0..69fb2a3593 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Client.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Client.java @@ -32,5 +32,8 @@ public interface Client extends Endpoint, Channel, Resetable { * reconnect. */ void reconnect() throws RemotingException; - + + @Deprecated + void reset(com.alibaba.dubbo.common.Parameters parameters); + } \ No newline at end of file diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Server.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Server.java index 7abe6dbbd5..909cf0df3d 100755 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Server.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Server.java @@ -52,5 +52,8 @@ public interface Server extends Endpoint, Resetable { * @return channel */ Channel getChannel(InetSocketAddress remoteAddress); + + @Deprecated + void reset(com.alibaba.dubbo.common.Parameters parameters); } \ No newline at end of file diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/ExchangeServerDelegate.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/ExchangeServerDelegate.java index 50f8130e51..b15efcd8f3 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/ExchangeServerDelegate.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/ExchangeServerDelegate.java @@ -18,7 +18,6 @@ package com.alibaba.dubbo.remoting.exchange.support; import java.net.InetSocketAddress; import java.util.Collection; -import com.alibaba.dubbo.common.Parameters; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.Channel; import com.alibaba.dubbo.remoting.ChannelHandler; @@ -59,7 +58,7 @@ public class ExchangeServerDelegate implements ExchangeServer { } @Deprecated - public void reset(Parameters parameters){ + public void reset(com.alibaba.dubbo.common.Parameters parameters){ reset(getUrl().addParameters(parameters.getParameters())); } diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeClient.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeClient.java index 8e9af44174..c94228272b 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeClient.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeClient.java @@ -17,7 +17,6 @@ package com.alibaba.dubbo.remoting.exchange.support.header; import java.net.InetSocketAddress; -import com.alibaba.dubbo.common.Parameters; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.ChannelHandler; import com.alibaba.dubbo.remoting.Client; @@ -103,7 +102,7 @@ public class HeaderExchangeClient implements ExchangeClient { } @Deprecated - public void reset(Parameters parameters){ + public void reset(com.alibaba.dubbo.common.Parameters parameters){ reset(getUrl().addParameters(parameters.getParameters())); } diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeServer.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeServer.java index 3a719c7c92..901746531f 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeServer.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeServer.java @@ -24,7 +24,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Parameters; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; @@ -200,7 +199,7 @@ public class HeaderExchangeServer implements ExchangeServer { } @Deprecated - public void reset(Parameters parameters){ + public void reset(com.alibaba.dubbo.common.Parameters parameters){ reset(getUrl().addParameters(parameters.getParameters())); } diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractEndpoint.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractEndpoint.java index 9ccc3484bd..a220a7494e 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractEndpoint.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractEndpoint.java @@ -17,7 +17,6 @@ package com.alibaba.dubbo.remoting.transport; import com.alibaba.dubbo.common.Constants; import com.alibaba.dubbo.common.ExtensionLoader; -import com.alibaba.dubbo.common.Parameters; import com.alibaba.dubbo.common.Resetable; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.logger.Logger; @@ -83,7 +82,7 @@ public abstract class AbstractEndpoint extends AbstractPeer implements Resetable } @Deprecated - public void reset(Parameters parameters){ + public void reset(com.alibaba.dubbo.common.Parameters parameters){ reset(getUrl().addParameters(parameters.getParameters())); } diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/ClientDelegate.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/ClientDelegate.java index e5b3e5b608..6bb445df20 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/ClientDelegate.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/ClientDelegate.java @@ -17,7 +17,6 @@ package com.alibaba.dubbo.remoting.transport; import java.net.InetSocketAddress; -import com.alibaba.dubbo.common.Parameters; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.ChannelHandler; import com.alibaba.dubbo.remoting.Client; @@ -55,7 +54,7 @@ public class ClientDelegate implements Client { } @Deprecated - public void reset(Parameters parameters){ + public void reset(com.alibaba.dubbo.common.Parameters parameters){ reset(getUrl().addParameters(parameters.getParameters())); } diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/ServerDelegate.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/ServerDelegate.java index d1fb3efdeb..e91572e0b2 100644 --- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/ServerDelegate.java +++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/ServerDelegate.java @@ -18,7 +18,6 @@ package com.alibaba.dubbo.remoting.transport; import java.net.InetSocketAddress; import java.util.Collection; -import com.alibaba.dubbo.common.Parameters; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.remoting.Channel; import com.alibaba.dubbo.remoting.ChannelHandler; @@ -58,7 +57,7 @@ public class ServerDelegate implements Server { } @Deprecated - public void reset(Parameters parameters){ + public void reset(com.alibaba.dubbo.common.Parameters parameters){ reset(getUrl().addParameters(parameters.getParameters())); }