target, int expireFlag) {
- super(filters, servant, kind, target);
- this.expireFlag = expireFlag;
- }
-
- @Override
- protected void doRealInvoke(Request request, Response response)
- throws Throwable {
- if (request instanceof TarsServantRequest) {
- TarsServantResponse tarsServantResponse = (TarsServantResponse)response;
- if (expireFlag == 0) {
- try {
- if (tarsServantResponse.getCause() != null) {
- throw new TarsException(tarsServantResponse.getCause());
- }
- if (tarsServantResponse.getRet() != TarsHelper.SERVERSUCCESS) {
- throw ServerException.makeException(tarsServantResponse.getRet());
- }
- if (target != null) {
- this.target.onCompleted(tarsServantResponse);
- }
- } catch (Throwable ex) {
- if (target != null) {
- target.onException(ex);
- }
- throw ex;
- }
- } else if (expireFlag == 1) {
- if (target != null) {
- this.target.onExpired();
- }
- }
- }
-
- }
-
-}
diff --git a/core/src/main/java/com/qq/tars/client/rpc/tars/TarsCallbackWrapper.java b/core/src/main/java/com/qq/tars/client/rpc/tars/TarsCallbackWrapper.java
deleted file mode 100644
index f5519cb8..00000000
--- a/core/src/main/java/com/qq/tars/client/rpc/tars/TarsCallbackWrapper.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * Tencent is pleased to support the open source community by making Tars available.
- *
- * Copyright (C) 2016 THL A29 Limited, a Tencent company. All rights reserved.
- *
- * Licensed under the BSD 3-Clause License (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * https://opensource.org/licenses/BSD-3-Clause
- *
- * 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.qq.tars.client.rpc.tars;
-
-import com.qq.tars.client.ServantProxyConfig;
-import com.qq.tars.client.cluster.ServantnvokerAliveChecker;
-import com.qq.tars.client.util.ClientLogger;
-import com.qq.tars.common.Filter;
-import com.qq.tars.common.FilterChain;
-import com.qq.tars.common.FilterKind;
-import com.qq.tars.common.util.Constants;
-import com.qq.tars.common.util.DyeingSwitch;
-import com.qq.tars.context.DistributedContextManager;
-import com.qq.tars.net.client.Callback;
-import com.qq.tars.protocol.util.TarsHelper;
-import com.qq.tars.rpc.exc.TimeoutException;
-import com.qq.tars.rpc.protocol.tars.TarsServantRequest;
-import com.qq.tars.rpc.protocol.tars.TarsServantResponse;
-import com.qq.tars.server.core.AppContextManager;
-import com.qq.tars.support.stat.InvokeStatHelper;
-
-import java.util.List;
-
-public class TarsCallbackWrapper implements Callback {
-
- private final String objName;
- private final ServantProxyConfig config;
- private final String methodName;
- private final String remoteIp;
- private final int remotePort;
- private final long bornTime;
- private final TarsServantRequest request;
- private final TarsInvoker invoker;
- private final Callback callback;
- private List filters;
-
- public TarsCallbackWrapper(ServantProxyConfig config, String methodName, String remoteIp, int remotePort,
- long bornTime, TarsServantRequest request, Callback callback, TarsInvoker invoker) {
- this.callback = callback;
- this.config = config;
- this.objName = config.getSimpleObjectName();
-
- this.methodName = methodName;
- this.remoteIp = remoteIp;
- this.remotePort = remotePort;
- this.bornTime = bornTime;
- this.request = request;
- this.filters = AppContextManager.getInstance().getAppContext() == null ? null : AppContextManager.getInstance().getAppContext().getFilters(FilterKind.CALLBACK);
- this.invoker = invoker;
- }
-
- public void onCompleted(TarsServantResponse response) {
- int ret = response.getRet() == TarsHelper.SERVERSUCCESS ? Constants.INVOKE_STATUS_SUCC : Constants.INVOKE_STATUS_EXEC;
- boolean available = ServantnvokerAliveChecker.isAlive(invoker.getUrl(), config, ret);
- invoker.setAvailable(available);
- try {
- beforeCallback();
- FilterChain filterChain = new TarsCallbackFilterChain(filters, objName, FilterKind.CALLBACK, callback, 0);
- filterChain.doFilter(request, response);
- } catch (Throwable ex) {
- ret = Constants.INVOKE_STATUS_EXEC;
- ClientLogger.getLogger().error("error occurred on callback completed", ex);
- onException(ex);
- } finally {
- afterCallback();
- InvokeStatHelper.getInstance().addProxyStat(objName).addInvokeTimeByClient(config.getModuleName(), config.getSlaveName(), config.getSlaveSetName(), config.getSlaveSetArea(), config.getSlaveSetID(), methodName, remoteIp, remotePort, ret, System.currentTimeMillis() - bornTime);
- }
- }
-
- public void onException(Throwable e) {
- try {
- if (callback != null) {
- this.callback.onException(e);
- }
- } catch (Throwable ex) {
- ClientLogger.getLogger().error("error occurred on callback exception", ex);
- }
- }
-
- public void onExpired() {
- int ret = Constants.INVOKE_STATUS_TIMEOUT;
- invoker.setAvailable(ServantnvokerAliveChecker.isAlive(invoker.getUrl(), config, ret));
- try {
- beforeCallback();
- FilterChain filterChain = new TarsCallbackFilterChain(filters, objName, FilterKind.CALLBACK, callback, 1);
- TarsServantResponse response = new TarsServantResponse(request.getIoSession());
- response.setRequest(request);
- response.setTicketNumber(request.getTicketNumber());
- response.setCause(new TimeoutException("async call timeout"));
- filterChain.doFilter(request, response);
- } catch (Throwable ex) {
- ClientLogger.getLogger().error("error occurred on callback expired", ex);
- } finally {
- afterCallback();
- InvokeStatHelper.getInstance().addProxyStat(objName).addInvokeTimeByClient(config.getModuleName(), config.getSlaveName(), config.getSlaveSetName(), config.getSlaveSetArea(), config.getSlaveSetID(), methodName, remoteIp, remotePort, ret, System.currentTimeMillis() - bornTime);
- }
- }
-
- private void beforeCallback() {
- if (isDyeingReq()) {
- DyeingSwitch.enableUnactiveDyeing(request.getStatus().get(DyeingSwitch.STATUS_DYED_KEY), request.getStatus().get(DyeingSwitch.STATUS_DYED_FILENAME));
- }
-
- }
-
- private void afterCallback() {
- DistributedContextManager.releaseDistributedContext();
- }
-
- private boolean isDyeingReq() {
- return ((request.getMessageType() & TarsHelper.MESSAGETYPEDYED) == TarsHelper.MESSAGETYPEDYED) ? true : false;
- }
-}
diff --git a/core/src/main/java/com/qq/tars/client/rpc/tars/TarsClientFilterChain.java b/core/src/main/java/com/qq/tars/client/rpc/tars/TarsClientFilterChain.java
index 66c6bf64..fec52598 100644
--- a/core/src/main/java/com/qq/tars/client/rpc/tars/TarsClientFilterChain.java
+++ b/core/src/main/java/com/qq/tars/client/rpc/tars/TarsClientFilterChain.java
@@ -1,64 +1,54 @@
package com.qq.tars.client.rpc.tars;
-import java.util.List;
-import java.util.concurrent.Future;
-
-import com.qq.tars.client.rpc.ServantClient;
+import com.qq.tars.client.rpc.RPCClient;
+import com.qq.tars.client.rpc.Request;
+import com.qq.tars.client.rpc.Response;
import com.qq.tars.common.AbstractFilterChain;
import com.qq.tars.common.Filter;
import com.qq.tars.common.FilterKind;
-import com.qq.tars.common.util.BeanAccessor;
-import com.qq.tars.net.client.Callback;
-import com.qq.tars.net.core.Request;
-import com.qq.tars.net.core.Response;
-import com.qq.tars.rpc.protocol.ServantRequest;
import com.qq.tars.rpc.protocol.tars.TarsServantRequest;
-import com.qq.tars.rpc.protocol.tars.TarsServantResponse;
-public class TarsClientFilterChain extends AbstractFilterChain {
-
- private int type;
-
- private Callback callback;
-
- private volatile Future future;
-
- public TarsClientFilterChain(List filters, String servant,
- FilterKind kind, ServantClient target, int type, Callback callback) {
- super(filters, servant, kind, target);
- this.type = type;
- this.callback = callback;
- }
-
-
- public Future getFuture() {
- return future;
- }
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+public class TarsClientFilterChain extends AbstractFilterChain {
+
+ private Request.InvokeStatus type;
+
+ public TarsClientFilterChain(List filters, String servant,
+ FilterKind kind, RPCClient target, Request.InvokeStatus type) {
+ super(filters, servant, kind, target);
+ this.type = type;
+
+ }
+
+
+ @Override
+ protected CompletableFuture doRealInvoke(Request request) throws Throwable {
+ if (request instanceof TarsServantRequest && target != null) {
+ return target.send(request);
+ } else {
+ throw new RuntimeException("[tars] tarsClient Filterchian invoke error!");
+ }
+
+ }
+
+ @Override
+ protected void doRealInvoke(Request request, Response response) throws Throwable {
+ if (request instanceof TarsServantRequest && target != null) {
+ target.send(request);
+ } else {
+ throw new RuntimeException("[tars] tarsClient Filterchian invoke error!");
+ }
+ }
+
- @Override
- protected void doRealInvoke(Request request, Response response) throws Throwable {
- if (request instanceof TarsServantRequest && target != null) {
- TarsServantResponse tarsServantResponse = (TarsServantResponse)response;
- if (type == 0) {
- try {
- TarsServantResponse result = target.invokeWithSync((ServantRequest) request);
- BeanAccessor.setBeanValue(tarsServantResponse, "cause", result.getCause());
- BeanAccessor.setBeanValue(tarsServantResponse, "result", result.getResult());
- BeanAccessor.setBeanValue(tarsServantResponse, "ret", result.getRet());
- } catch (Exception e) {
- BeanAccessor.setBeanValue(tarsServantResponse, "cause", e);
- throw e;
- }
- return;
- }
- if (type == 1) {
- target.invokeWithAsync((ServantRequest)request, callback);
- return;
- }
- if (type == 2) {
- future = target.invokeWithFuture((ServantRequest) request);
- }
- }
- }
+ public CompletableFuture doFilter(Request request) throws Throwable {
+ if (request instanceof TarsServantRequest && target != null) {
+ return target.send(request);
+ } else {
+ throw new RuntimeException("[tars] tarsClient FilterChain invoke error!");
+ }
+ }
-}
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/qq/tars/client/rpc/tars/TarsInvokeContext.java b/core/src/main/java/com/qq/tars/client/rpc/tars/TarsInvokeContext.java
index a2419cb2..6753132b 100644
--- a/core/src/main/java/com/qq/tars/client/rpc/tars/TarsInvokeContext.java
+++ b/core/src/main/java/com/qq/tars/client/rpc/tars/TarsInvokeContext.java
@@ -16,13 +16,13 @@
package com.qq.tars.client.rpc.tars;
+import com.qq.tars.client.rpc.ServantInvokeContext;
+import com.qq.tars.protocol.util.TarsHelper;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.Map;
-import com.qq.tars.client.rpc.ServantInvokeContext;
-import com.qq.tars.protocol.util.TarsHelper;
-
@SuppressWarnings("serial")
public class TarsInvokeContext extends ServantInvokeContext {
diff --git a/core/src/main/java/com/qq/tars/client/rpc/tars/TarsInvoker.java b/core/src/main/java/com/qq/tars/client/rpc/tars/TarsInvoker.java
index 8acd4a87..52e592d2 100644
--- a/core/src/main/java/com/qq/tars/client/rpc/tars/TarsInvoker.java
+++ b/core/src/main/java/com/qq/tars/client/rpc/tars/TarsInvoker.java
@@ -17,8 +17,10 @@
package com.qq.tars.client.rpc.tars;
import com.qq.tars.client.ServantProxyConfig;
-import com.qq.tars.client.cluster.ServantnvokerAliveChecker;
-import com.qq.tars.client.rpc.ServantClient;
+import com.qq.tars.client.cluster.ServantInvokerAliveChecker;
+import com.qq.tars.client.rpc.RPCClient;
+import com.qq.tars.client.rpc.Request;
+import com.qq.tars.client.rpc.Response;
import com.qq.tars.client.rpc.ServantInvokeContext;
import com.qq.tars.client.rpc.ServantInvoker;
import com.qq.tars.common.Filter;
@@ -26,16 +28,13 @@
import com.qq.tars.common.FilterKind;
import com.qq.tars.common.util.Constants;
import com.qq.tars.common.util.DyeingSwitch;
-import com.qq.tars.context.DistributedContext;
-import com.qq.tars.context.DistributedContextManager;
-import com.qq.tars.net.client.Callback;
-import com.qq.tars.net.core.Request.InvokeStatus;
+import com.qq.tars.context.TarsContext;
import com.qq.tars.protocol.tars.support.TarsMethodInfo;
-import com.qq.tars.protocol.tars.support.TarsMethodParameterInfo;
import com.qq.tars.protocol.util.TarsHelper;
import com.qq.tars.rpc.common.Url;
import com.qq.tars.rpc.exc.NotConnectedException;
import com.qq.tars.rpc.exc.ServerException;
+import com.qq.tars.rpc.exc.TarsException;
import com.qq.tars.rpc.exc.TimeoutException;
import com.qq.tars.rpc.protocol.tars.TarsServantRequest;
import com.qq.tars.rpc.protocol.tars.TarsServantResponse;
@@ -47,36 +46,39 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
public class TarsInvoker extends ServantInvoker {
- List filters;
+ final List filters;
- public TarsInvoker(ServantProxyConfig config, Class api, Url url, ServantClient[] clients) {
+ public TarsInvoker(ServantProxyConfig config, Class api, Url url, RPCClient[] clients) {
super(config, api, url, clients);
+ System.out.println(AppContextManager.getInstance().getAppContext() == null);
filters = AppContextManager.getInstance().getAppContext() == null ? null : AppContextManager.getInstance().getAppContext().getFilters(FilterKind.CLIENT);
}
@Override
- protected void setAvailable(boolean available) {
+ public void setAvailable(boolean available) {
super.setAvailable(available);
}
protected Object doInvokeServant(final ServantInvokeContext inv) throws Throwable {
- long begin = System.currentTimeMillis();
-
+ final long begin = System.currentTimeMillis();
int ret = Constants.INVOKE_STATUS_SUCC;
- boolean isAsync = TarsHelper.isAsync(inv.getMethodName());
try {
Method method = getApi().getMethod(inv.getMethodName(), inv.getParameterTypes());
- if (isAsync) {
- invokeWithAsync(method, inv.getArguments(), inv.getAttachments());
- return null;
+ if (inv.isPromiseFuture()) {
+ return invokeWithPromiseFuture(method, inv.getArguments(), inv.getAttachments());// return Future Result
} else {
TarsServantResponse response = invokeWithSync(method, inv.getArguments(), inv.getAttachments());
ret = response.getRet() == TarsHelper.SERVERSUCCESS ? Constants.INVOKE_STATUS_SUCC : Constants.INVOKE_STATUS_EXEC;
if (response.getRet() != TarsHelper.SERVERSUCCESS) {
- throw ServerException.makeException(response.getRet());
+ throw ServerException.makeException(response.getRet(), response.getRemark());
+ }
+ if (response.getCause() != null) {
+ throw new TarsException(response.getCause());
}
return response.getResult();
}
@@ -90,20 +92,22 @@ protected Object doInvokeServant(final ServantInvokeContext inv) throws Throwabl
}
throw e;
} finally {
- if (!isAsync) {
- setAvailable(ServantnvokerAliveChecker.isAlive(getUrl(), config, ret));
- InvokeStatHelper.getInstance().addProxyStat(objName).addInvokeTimeByClient(config.getMasterName(), config.getSlaveName(), config.getSlaveSetName(), config.getSlaveSetArea(), config.getSlaveSetID(), inv.getMethodName(), getUrl().getHost(), getUrl().getPort(), ret, System.currentTimeMillis() - begin);
+ if (inv.isNormal()) {
+ setAvailable(ServantInvokerAliveChecker.isAlive(getUrl(), config, ret));
+ InvokeStatHelper.getInstance().addProxyStat(objName)
+ .addInvokeTimeByClient(config.getMasterName(), config.getSlaveName(), config.getSlaveSetName(), config.getSlaveSetArea(),
+ config.getSlaveSetID(), inv.getMethodName(), getUrl().getHost(), getUrl().getPort(), ret, System.currentTimeMillis() - begin);
}
}
}
- private ServantClient getClient() {
+ private RPCClient getClient() {
return clients.length == 1 ? clients[0] : clients[(index.getAndIncrement() & Integer.MAX_VALUE) % clients.length];
}
private TarsServantResponse invokeWithSync(Method method, Object args[], Map context) throws Throwable {
- ServantClient client = getClient();
- TarsServantRequest request = new TarsServantRequest(client.getIoSession());
+ RPCClient client = getClient();
+ TarsServantRequest request = new TarsServantRequest();
request.setVersion(TarsHelper.VERSION);
request.setMessageType(isHashInvoke(context) ? TarsHelper.MESSAGETYPEHASH : TarsHelper.MESSAGETYPENULL);
request.setPacketType(TarsHelper.NORMAL);
@@ -113,84 +117,65 @@ private TarsServantResponse invokeWithSync(Method method, Object args[], Map status = new HashMap();
- String routeKey = distributedContext.get(DyeingSwitch.DYEINGKEY);
- String fileName = distributedContext.get(DyeingSwitch.FILENAME);
+ HashMap status = new HashMap<>();
+ String routeKey = ctx.get(TarsContext.DYEING_KEY);
+ String fileName = ctx.get(TarsContext.DYEING_FILENAME);
status.put(DyeingSwitch.STATUS_DYED_KEY, routeKey == null ? "" : routeKey);
status.put(DyeingSwitch.STATUS_DYED_FILENAME, fileName == null ? "" : fileName);
request.setStatus(status);
-
}
- FilterChain filterChain = new TarsClientFilterChain(filters, objName, FilterKind.CLIENT, client, 0, null);
- filterChain.doFilter(request, response);
- return response;
+ FilterChain filterChain = new TarsClientFilterChain(filters, objName, FilterKind.CLIENT, client, Request.InvokeStatus.SYNC_CALL);
+ CompletableFuture responseCompletableFuture = filterChain.doFilter(request);
+ return (TarsServantResponse) responseCompletableFuture.get(request.getTimeout(), TimeUnit.MILLISECONDS);
}
- @SuppressWarnings("unchecked")
- private void invokeWithAsync(Method method, Object args[], Map context) throws Throwable {
- ServantClient client = getClient();
- TarsServantRequest request = new TarsServantRequest(client.getIoSession());
+ /**
+ * promise call
+ * @param method
+ * @param args
+ * @param context
+ */
+ private CompletableFuture invokeWithPromiseFuture(Method method, Object args[], Map context) throws Throwable {
+ final RPCClient client = getClient();
+ final TarsServantRequest request = new TarsServantRequest();
request.setVersion(TarsHelper.VERSION);
request.setMessageType(isHashInvoke(context) ? TarsHelper.MESSAGETYPEHASH : TarsHelper.MESSAGETYPENULL);
request.setPacketType(TarsHelper.NORMAL);
request.setServantName(objName);
- request.setFunctionName(method.getName().replaceAll("async_", ""));
+ request.setFunctionName(method.getName().replaceAll(Constants.TARS_METHOD_PROMISE_START_WITH, ""));
request.setContext(context);
-
- TarsMethodInfo methodInfo = AnalystManager.getInstance().getMethodMap(super.getApi()).get(method);
+ request.setMethodParameters(args); //completableFuture send Callback
+ final TarsMethodInfo methodInfo = AnalystManager.getInstance().getMethodMap(super.getApi()).get(method);
+ request.setInvokeStatus(Request.InvokeStatus.FUTURE_CALL);
request.setApi(super.getApi());
request.setMethodInfo(methodInfo);
- request.setMethodParameters(args);
- request.setInvokeStatus(InvokeStatus.ASYNC_CALL);
- Callback callback = null;
- List parameterInfoList = methodInfo.getParametersList();
- for (TarsMethodParameterInfo parameterInfo : parameterInfoList) {
- if (TarsHelper.isCallback(parameterInfo.getAnnotations())) {
- callback = (Callback) args[parameterInfo.getOrder()];
- break;
- }
- }
-
- if (callback == null) {
- request.setPacketType(TarsHelper.ONEWAY);
- }
-
- TarsServantResponse response = new TarsServantResponse(client.getIoSession());
-
- DistributedContext distributedContext = DistributedContextManager.getDistributedContext();
- Boolean bDyeing = distributedContext.get(DyeingSwitch.BDYEING);
+ TarsContext ctx = TarsContext.current();
+ Boolean bDyeing = ctx.get(TarsContext.DYEING);
if (bDyeing != null && bDyeing == true) {
request.setMessageType(request.getMessageType() | TarsHelper.MESSAGETYPEDYED);
- HashMap status = new HashMap();
- String routeKey = distributedContext.get(DyeingSwitch.DYEINGKEY);
- String fileName = distributedContext.get(DyeingSwitch.FILENAME);
+ HashMap status = new HashMap<>();
+ String routeKey = ctx.get(TarsContext.DYEING_KEY);
+ String fileName = ctx.get(TarsContext.DYEING_FILENAME);
status.put(DyeingSwitch.STATUS_DYED_KEY, routeKey == null ? "" : routeKey);
status.put(DyeingSwitch.STATUS_DYED_FILENAME, fileName == null ? "" : fileName);
request.setStatus(status);
-
}
- FilterChain filterChain = new TarsClientFilterChain(filters, objName, FilterKind.CLIENT, client, 1,
- new TarsCallbackWrapper(config, request.getFunctionName(), getUrl().getHost(), getUrl().getPort(), request.getBornTime(), request, callback, this));
- filterChain.doFilter(request, response);
+ //sync call all filter
+ final FilterChain filterChain = new TarsClientFilterChain(filters, objName, FilterKind.CLIENT, client, Request.InvokeStatus.FUTURE_CALL);
+ CompletableFuture tarsResponse = filterChain.doFilter(request);
+ return tarsResponse.thenCompose(tarsresponseObj -> {
+ TarsServantResponse tarsServantResponse = (TarsServantResponse) tarsresponseObj;
+ if (tarsServantResponse != null) {
+ tarsResponse.completeExceptionally(tarsServantResponse.getCause());
+ }
+ return CompletableFuture.completedFuture((V) tarsServantResponse.getResult());
+ });
}
private boolean isHashInvoke(Map context) {
diff --git a/core/src/main/java/com/qq/tars/client/rpc/tars/TarsProtocolInvoker.java b/core/src/main/java/com/qq/tars/client/rpc/tars/TarsProtocolInvoker.java
index 3367e1e1..a0445bb5 100644
--- a/core/src/main/java/com/qq/tars/client/rpc/tars/TarsProtocolInvoker.java
+++ b/core/src/main/java/com/qq/tars/client/rpc/tars/TarsProtocolInvoker.java
@@ -16,22 +16,19 @@
package com.qq.tars.client.rpc.tars;
-import java.lang.reflect.Method;
-import java.util.concurrent.ThreadPoolExecutor;
-
import com.qq.tars.client.ServantProxyConfig;
import com.qq.tars.client.rpc.ServantProtocolInvoker;
-import com.qq.tars.net.protocol.ProtocolFactory;
import com.qq.tars.rpc.common.InvokeContext;
import com.qq.tars.rpc.common.Invoker;
import com.qq.tars.rpc.common.Url;
import com.qq.tars.rpc.protocol.tars.support.AnalystManager;
+import java.lang.reflect.Method;
+
public class TarsProtocolInvoker extends ServantProtocolInvoker {
- public TarsProtocolInvoker(Class api, ServantProxyConfig config, ProtocolFactory protocolFactory,
- ThreadPoolExecutor threadPoolExecutor) {
- super(api, config, protocolFactory, threadPoolExecutor);
+ public TarsProtocolInvoker(Class api, ServantProxyConfig config) {
+ super(api, config);
AnalystManager.getInstance().registry(api, servantProxyConfig.getSimpleObjectName());
}
diff --git a/core/src/main/java/com/qq/tars/client/support/ClientPoolManager.java b/core/src/main/java/com/qq/tars/client/support/ClientPoolManager.java
index 16eaff01..e7705684 100644
--- a/core/src/main/java/com/qq/tars/client/support/ClientPoolManager.java
+++ b/core/src/main/java/com/qq/tars/client/support/ClientPoolManager.java
@@ -16,29 +16,28 @@
package com.qq.tars.client.support;
-import java.io.IOException;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
import com.qq.tars.client.CommunicatorConfig;
-import com.qq.tars.client.ServantProxyConfig;
-import com.qq.tars.client.rpc.ServantClient;
+import com.qq.tars.client.rpc.RPCClient;
import com.qq.tars.common.util.concurrent.TaskQueue;
import com.qq.tars.common.util.concurrent.TaskThreadFactory;
import com.qq.tars.common.util.concurrent.TaskThreadPoolExecutor;
-import com.qq.tars.net.core.nio.SelectorManager;
-import com.qq.tars.net.protocol.ProtocolFactory;
+import com.qq.tars.support.log.LoggerFactory;
-public class ClientPoolManager {
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+public class ClientPoolManager {
+ private static final Logger logger = LoggerFactory.getClientLogger();
private final static ConcurrentHashMap clientThreadPoolMap = new ConcurrentHashMap();
- private final static ConcurrentHashMap selectorsMap = new ConcurrentHashMap();
public static ThreadPoolExecutor getClientThreadPoolExecutor(CommunicatorConfig communicatorConfig) {
ThreadPoolExecutor clientPoolExecutor = clientThreadPoolMap.get(communicatorConfig);
if (clientPoolExecutor == null) {
- synchronized (ServantClient.class) {
+ synchronized (RPCClient.class) {
clientPoolExecutor = clientThreadPoolMap.get(communicatorConfig);
if (clientPoolExecutor == null) {
clientThreadPoolMap.put(communicatorConfig, createThreadPool(communicatorConfig));
@@ -55,30 +54,13 @@ private static ThreadPoolExecutor createThreadPool(CommunicatorConfig communicat
int keepAliveTime = communicatorConfig.getKeepAliveTime();
int queueSize = communicatorConfig.getQueueSize();
TaskQueue taskqueue = new TaskQueue(queueSize);
-
String namePrefix = "tars-client-executor-";
+ logger.log(Level.INFO, "create client thread pool, communicator config is {0}", communicatorConfig.toString());
TaskThreadPoolExecutor executor = new TaskThreadPoolExecutor(corePoolSize, maxPoolSize, keepAliveTime, TimeUnit.SECONDS, taskqueue, new TaskThreadFactory(namePrefix));
taskqueue.setParent(executor);
return executor;
}
- public static SelectorManager getSelectorManager(ProtocolFactory protocolFactory,
- ThreadPoolExecutor threadPoolExecutor, boolean keepAlive,
- boolean udpMode, ServantProxyConfig servantProxyConfig) throws IOException {
- SelectorManager selector = selectorsMap.get(servantProxyConfig);
- if (selector == null) {
- synchronized (selectorsMap) {
- selector = selectorsMap.get(servantProxyConfig);
- if (selector == null) {
- int selectorPoolSize = convertInt(System.getProperty("com.qq.tars.net.client.selectorPoolSize"), 2);
- selector = new SelectorManager(selectorPoolSize, protocolFactory, threadPoolExecutor, null, keepAlive, "servant-proxy-" + servantProxyConfig.getCommunicatorId(), udpMode);
- selector.start();
- selectorsMap.put(servantProxyConfig, selector);
- }
- }
- }
- return selector;
- }
private static int convertInt(String value, int defaults) {
if (value == null) {
diff --git a/core/src/main/java/com/qq/tars/client/support/ClientThreadPoolManager.java b/core/src/main/java/com/qq/tars/client/support/ClientThreadPoolManager.java
index 17cd0c52..85541f20 100644
--- a/core/src/main/java/com/qq/tars/client/support/ClientThreadPoolManager.java
+++ b/core/src/main/java/com/qq/tars/client/support/ClientThreadPoolManager.java
@@ -16,16 +16,16 @@
package com.qq.tars.client.support;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
import com.qq.tars.client.CommunicatorConfig;
-import com.qq.tars.client.rpc.ServantClient;
+import com.qq.tars.client.rpc.RPCClient;
import com.qq.tars.common.util.concurrent.TaskQueue;
import com.qq.tars.common.util.concurrent.TaskThreadFactory;
import com.qq.tars.common.util.concurrent.TaskThreadPoolExecutor;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
public class ClientThreadPoolManager {
private static ConcurrentHashMap clientThreadPoolMap = new ConcurrentHashMap();
@@ -34,7 +34,7 @@ public static ThreadPoolExecutor getClientThreadPoolExecutor(CommunicatorConfig
String contextIdentity = resolveCurrentContextIdentity();
ThreadPoolExecutor clientPoolExecutor = clientThreadPoolMap.get(contextIdentity);
if (clientPoolExecutor == null) {
- synchronized (ServantClient.class) {
+ synchronized (RPCClient.class) {
clientPoolExecutor = clientThreadPoolMap.get(contextIdentity);
if (clientPoolExecutor == null) {
clientThreadPoolMap.put(contextIdentity, createThreadPool(communicatorConfig));
@@ -59,10 +59,10 @@ private static ThreadPoolExecutor createThreadPool(CommunicatorConfig communicat
}
private static String resolveCurrentContextIdentity() {
- Object slefClassLoader = ClientThreadPoolManager.class.getClassLoader();
+ Object selfClassLoader = ClientThreadPoolManager.class.getClassLoader();
Object contextClassLoader = Thread.currentThread().getContextClassLoader();
String contextIdentity = ClientThreadPoolManager.class.getName();
- if (slefClassLoader != null && contextClassLoader != null && slefClassLoader != contextClassLoader) {
+ if (selfClassLoader != null && contextClassLoader != null && selfClassLoader != contextClassLoader) {
contextIdentity = contextClassLoader.toString();
}
return contextIdentity;
diff --git a/core/src/main/java/com/qq/tars/client/support/ServantCacheManager.java b/core/src/main/java/com/qq/tars/client/support/ServantCacheManager.java
index 180128c9..7e1cd523 100644
--- a/core/src/main/java/com/qq/tars/client/support/ServantCacheManager.java
+++ b/core/src/main/java/com/qq/tars/client/support/ServantCacheManager.java
@@ -16,6 +16,14 @@
package com.qq.tars.client.support;
+import com.qq.tars.common.util.Constants;
+import com.qq.tars.common.util.Loader;
+import com.qq.tars.common.util.StringUtils;
+import com.qq.tars.support.log.LoggerFactory;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -27,17 +35,14 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReentrantLock;
-import com.qq.tars.client.util.ClientLogger;
-import com.qq.tars.common.util.Constants;
-import com.qq.tars.common.util.Loader;
-import com.qq.tars.common.util.StringUtils;
-
public final class ServantCacheManager {
+ private static final Logger LOGGER = LoggerFactory.getClientLogger();
private final static ServantCacheManager instance = new ServantCacheManager();
@@ -68,7 +73,7 @@ public void save(String CommunicatorId, String objName, String endpointList, Str
props.put(makeKey(CommunicatorId, objName), endpointList);
saveToLocal(dataPath);
} catch (Throwable e) {
- ClientLogger.getLogger().error("", e);
+ LOGGER.log(Level.SEVERE, "", e);
}
}
@@ -103,9 +108,9 @@ private void saveToLocal(String dataPath) {
}
out = new BufferedOutputStream(new FileOutputStream(file));
props.store(out, (new Date()).toString());
- ClientLogger.getLogger().info("save " + file.getAbsolutePath());
+ LOGGER.info("save " + file.getAbsolutePath());
} catch (Exception e) {
- ClientLogger.getLogger().error("save " + Constants.SERVER_NODE_CACHE_FILENAME + " failed", e);
+ LOGGER.log(Level.SEVERE, "save " + Constants.SERVER_NODE_CACHE_FILENAME + " failed", e);
} finally {
if (null != out) {
try {
@@ -130,7 +135,7 @@ private void loadCacheData(String dataPath) {
}
in = new BufferedInputStream(new FileInputStream(file));
props.load(in);
- ArrayList removeKey = new ArrayList();
+ List removeKey = new ArrayList<>();
for (Entry entry : props.entrySet()) {
if (entry.getKey().toString().startsWith("<")) {
removeKey.add(entry.getKey().toString());
@@ -139,9 +144,9 @@ private void loadCacheData(String dataPath) {
for (String key : removeKey) {
props.remove(key);
}
- ClientLogger.getLogger().info("load " + Constants.SERVER_NODE_CACHE_FILENAME);
+ LOGGER.log(Level.INFO, "load {0}", Constants.SERVER_NODE_CACHE_FILENAME);
} catch (Throwable e) {
- ClientLogger.getLogger().error("read file " + Constants.SERVER_NODE_CACHE_FILENAME + " error.", e);
+ LOGGER.log(Level.SEVERE, "read file " + Constants.SERVER_NODE_CACHE_FILENAME + " error.", e);
} finally {
if (null != in) {
try {
diff --git a/core/src/main/java/com/qq/tars/client/util/Pair.java b/core/src/main/java/com/qq/tars/client/util/Pair.java
index 19da6ee4..7fa5a532 100644
--- a/core/src/main/java/com/qq/tars/client/util/Pair.java
+++ b/core/src/main/java/com/qq/tars/client/util/Pair.java
@@ -17,6 +17,7 @@
package com.qq.tars.client.util;
import java.io.Serializable;
+import java.util.Objects;
public final class Pair implements Serializable {
@@ -33,7 +34,7 @@ public Pair(F f, S s) {
}
private static boolean eq(T o1, T o2) {
- return o1 == null ? o2 == null : o1.equals(o2);
+ return Objects.equals(o1, o2);
}
public boolean equals(Object o) {
diff --git a/core/src/main/java/com/qq/tars/common/AbstractFilterChain.java b/core/src/main/java/com/qq/tars/common/AbstractFilterChain.java
index 7d7648c7..67074eef 100644
--- a/core/src/main/java/com/qq/tars/common/AbstractFilterChain.java
+++ b/core/src/main/java/com/qq/tars/common/AbstractFilterChain.java
@@ -1,54 +1,60 @@
package com.qq.tars.common;
+import com.qq.tars.client.rpc.Request;
+import com.qq.tars.client.rpc.Response;
+
import java.util.Iterator;
import java.util.List;
-
-import com.qq.tars.net.core.Request;
-import com.qq.tars.net.core.Response;
+import java.util.concurrent.CompletableFuture;
public abstract class AbstractFilterChain implements FilterChain {
- private List filters;
-
- protected String servant;
-
- protected FilterKind kind;
-
- protected T target;
-
- private Iterator iteator;
-
- public AbstractFilterChain(List filters, String servant, FilterKind kind, T target) {
- this.filters = filters;
- this.servant = servant;
- this.kind = kind;
- this.target = target;
- }
-
- @Override
- public void doFilter(Request request, Response response) throws Throwable {
- Filter filter = getFilter();
- if (filter != null) {
- filter.doFilter(request, response, this);
- } else {
- doRealInvoke(request, response);
- }
-
- }
-
- private Filter getFilter() {
- if (filters == null || filters.isEmpty()) {
- return null;
- }
- if (iteator == null) {
- iteator = filters.iterator();
- }
- if (iteator.hasNext()) {
- return iteator.next();
- }
- return null;
- }
-
- protected abstract void doRealInvoke(Request request, Response response) throws Throwable;
+ protected String servant;
+ protected FilterKind kind;
+ protected T target;
+ private Iterator iterator;
+
+ public AbstractFilterChain(List filters, String servant, FilterKind kind, T target) {
+ this.servant = servant;
+ this.kind = kind;
+ this.target = target;
+ if (filters != null) {
+ this.iterator = filters.iterator();
+ }
+ }
+
+ @Override
+ public CompletableFuture doFilter(Request request) throws Throwable {
+ Filter filter = getFilter();
+ if (filter != null) {
+ return filter.doFilter(request, this);
+ } else {
+ return doRealInvoke(request);
+ }
+
+ }
+
+ private Filter getFilter() {
+ return iterator != null && iterator.hasNext() ? iterator.next() : null;
+ }
+
+
+ @Override
+ public void doFilter(Request request, Response response) throws Throwable {
+ Filter filter = getFilter();
+ if (filter != null) {
+ filter.doFilter(request, response, this);
+ return;
+ } else {
+ doRealInvoke(request, response);
+ return;
+ }
+
+ }
+
+ protected abstract CompletableFuture doRealInvoke(Request request) throws Throwable;
+
+ protected abstract void doRealInvoke(Request request, Response response) throws Throwable;
+
}
diff --git a/core/src/main/java/com/qq/tars/common/Filter.java b/core/src/main/java/com/qq/tars/common/Filter.java
index 86e78e55..aec7c777 100644
--- a/core/src/main/java/com/qq/tars/common/Filter.java
+++ b/core/src/main/java/com/qq/tars/common/Filter.java
@@ -1,14 +1,19 @@
package com.qq.tars.common;
-import com.qq.tars.net.core.Request;
-import com.qq.tars.net.core.Response;
+
+import com.qq.tars.client.rpc.Request;
+import com.qq.tars.client.rpc.Response;
+
+import java.util.concurrent.CompletableFuture;
public interface Filter {
-
- public void init();
-
- public void doFilter(Request request, Response response, FilterChain chain) throws Throwable;
-
- public void destroy();
+
+ void init();
+
+ void doFilter(Request request, Response response, FilterChain chain) throws Throwable;
+
+ CompletableFuture