Repository: incubator-rocketmq Updated Branches: refs/heads/rocketmq5 6593294f0 -> 73e0071a0
Interface polish, remove unused exeption code Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/73e0071a Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/73e0071a Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/73e0071a Branch: refs/heads/rocketmq5 Commit: 73e0071a01fa6f455b35471e9cd26084c58beaf4 Parents: 6593294 Author: yukon <yu...@apache.org> Authored: Fri Sep 22 17:07:01 2017 +0800 Committer: yukon <yu...@apache.org> Committed: Fri Sep 22 17:07:01 2017 +0800 ---------------------------------------------------------------------- .../apache/rocketmq/rpc/api/AdvancedClient.java | 6 ++-- .../apache/rocketmq/rpc/api/SimpleClient.java | 6 ++-- .../apache/rocketmq/rpc/api/SimpleServer.java | 6 ++-- .../rocketmq/rpc/impl/command/ResponseCode.java | 37 +------------------- 4 files changed, 10 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/73e0071a/remoting-core/rpc-api/src/main/java/org/apache/rocketmq/rpc/api/AdvancedClient.java ---------------------------------------------------------------------- diff --git a/remoting-core/rpc-api/src/main/java/org/apache/rocketmq/rpc/api/AdvancedClient.java b/remoting-core/rpc-api/src/main/java/org/apache/rocketmq/rpc/api/AdvancedClient.java index 881dc68..d2627cd 100644 --- a/remoting-core/rpc-api/src/main/java/org/apache/rocketmq/rpc/api/AdvancedClient.java +++ b/remoting-core/rpc-api/src/main/java/org/apache/rocketmq/rpc/api/AdvancedClient.java @@ -17,19 +17,19 @@ package org.apache.rocketmq.rpc.api; public interface AdvancedClient { - <T> T callSync(String address, + <T> T callSync(final String address, final String serviceCode, final String version, final Object[] parameter, final Class<T> responseType) throws Exception; - <T> Promise<T> callAsync(String address, + <T> Promise<T> callAsync(final String address, final String serviceCode, final String version, final Object[] parameter, final Class<T> responseType) throws Exception; - void callOneway(String address, + void callOneway(final String address, final String serviceCode, final String version, final Object[] parameter) throws Exception; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/73e0071a/remoting-core/rpc-api/src/main/java/org/apache/rocketmq/rpc/api/SimpleClient.java ---------------------------------------------------------------------- diff --git a/remoting-core/rpc-api/src/main/java/org/apache/rocketmq/rpc/api/SimpleClient.java b/remoting-core/rpc-api/src/main/java/org/apache/rocketmq/rpc/api/SimpleClient.java index ece1f60..ce5dffa 100644 --- a/remoting-core/rpc-api/src/main/java/org/apache/rocketmq/rpc/api/SimpleClient.java +++ b/remoting-core/rpc-api/src/main/java/org/apache/rocketmq/rpc/api/SimpleClient.java @@ -22,11 +22,11 @@ import java.util.concurrent.ExecutorService; import org.apache.rocketmq.remoting.api.ObjectLifecycle; public interface SimpleClient extends ObjectLifecycle { - <T> T bind(Class<T> service, String address, Properties properties); //keyValue + <T> T bind(final Class<T> service, final String address, final Properties properties); - void publish(Object service); + void publish(final Object service); - void publish(Object service, ExecutorService executorService); + void publish(final Object service, final ExecutorService executorService); AdvancedClient advancedClient(); } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/73e0071a/remoting-core/rpc-api/src/main/java/org/apache/rocketmq/rpc/api/SimpleServer.java ---------------------------------------------------------------------- diff --git a/remoting-core/rpc-api/src/main/java/org/apache/rocketmq/rpc/api/SimpleServer.java b/remoting-core/rpc-api/src/main/java/org/apache/rocketmq/rpc/api/SimpleServer.java index 4bf5372..5f67fe6 100644 --- a/remoting-core/rpc-api/src/main/java/org/apache/rocketmq/rpc/api/SimpleServer.java +++ b/remoting-core/rpc-api/src/main/java/org/apache/rocketmq/rpc/api/SimpleServer.java @@ -25,9 +25,9 @@ import org.apache.rocketmq.remoting.api.channel.RemotingChannel; public interface SimpleServer extends ObjectLifecycle { <T> T bind(final Class<T> service, final RemotingChannel channel, final Properties properties); - AdvancedServer advancedServer(); - void publish(final Object service); - void publish(Object service, ExecutorService executorService); + void publish(final Object service, final ExecutorService executorService); + + AdvancedServer advancedServer(); } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/73e0071a/remoting-core/rpc-impl/src/main/java/org/apache/rocketmq/rpc/impl/command/ResponseCode.java ---------------------------------------------------------------------- diff --git a/remoting-core/rpc-impl/src/main/java/org/apache/rocketmq/rpc/impl/command/ResponseCode.java b/remoting-core/rpc-impl/src/main/java/org/apache/rocketmq/rpc/impl/command/ResponseCode.java index 270adaa..217feb6 100644 --- a/remoting-core/rpc-impl/src/main/java/org/apache/rocketmq/rpc/impl/command/ResponseCode.java +++ b/remoting-core/rpc-impl/src/main/java/org/apache/rocketmq/rpc/impl/command/ResponseCode.java @@ -41,26 +41,8 @@ public class ResponseCode { public static final String USER_EXCEPTION_CLASS_NOT_FOUND = "401"; public static final String USER_EXCEPTION_METHOD_NOT_FOUND = "402"; - public static final String PROVIDER_OFF_LINE = "501"; - public static final String CONSUMER_OFF_LINE = "502"; - public static final String PROVIDER_NOT_EXIST = "503"; - public static final String CONSUMER_NOT_EXIST = "504"; - public static final String NAMESPACE_NOT_EXIST = "505"; - public static final String CLIENT_NOT_REGISTERED = "506"; - public static final String NO_SERVICE_ON_LINE = "507"; - public static final String NO_SERVICE_ON_THIS_SERVER = "508"; - public static final String SERVICE_ALREADY_ONLINE = "509"; - public static final String SERVER_NOT_EXIST = "510"; - public static final String SERVER_ALREADY_ONLINE = "511"; - public static final String NO_SERVER_ON_LINE = "512"; - public static final String ACCESS_DENIED = "513"; - public static final String SYSTEM_ERROR = "600"; - public static final String SYSTEM_BUSY = "601"; - public static final String BAD_REQUEST = "602"; public static final String PARAMETER_ERROR = "603"; - public static final String SEND_REQUEST_FAILED = "604"; - public static final String REQUEST_TIMEOUT = "605"; public static final String UNKNOWN_EXCEPTION = "606"; @Override @@ -78,25 +60,8 @@ public class ResponseCode { R_400(400, "User service happened"), R_401(401, "Class not found"), R_402(402, "Method not found"), - R_501(501, "Service provider offline "), - R_502(502, "Service consumer offline"), - R_503(503, "Service provider not exist"), - R_504(504, "Service consumer not exist"), - R_505(505, "Namespace not exist"), - R_506(506, "Client not registered"), - R_507(507, "No service online"), - R_508(508, "No service on this server"), - R_509(509, "Server already online"), - R_510(510, "Server not exist"), - R_511(511, "Server already online"), - R_512(512, "No server online"), - R_513(513, "Access denied"), - R_600(600, "System error"), - R_601(601, "System busy"), - R_602(602, "Bad request"), + R_603(603, "Parameter error"), - R_604(604, "Send request failed"), - R_605(605, "Request timeout"), R_606(606, "unknown exception"); private int responseCode = 0;