Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support dubbo attachments #13

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/main/java/org/apache/dubbo/proxy/dao/ServiceDefinition.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
package org.apache.dubbo.proxy.dao;


import java.util.Map;

public class ServiceDefinition {

private String application;
private String serviceID;
private String methodName;
private Object[] paramValues;
private String[] paramTypes;
private Map<String, String> attachments;


public String getApplication() {
return application;
Expand Down Expand Up @@ -48,4 +52,13 @@ public String[] getParamTypes() {
public void setParamTypes(String[] paramTypes) {
this.paramTypes = paramTypes;
}


public Map<String, String> getAttachments() {
return attachments;
}

public void setAttachments(Map<String, String> attachments) {
this.attachments = attachments;
}
}
15 changes: 11 additions & 4 deletions src/main/java/org/apache/dubbo/proxy/service/GenericInvoke.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package org.apache.dubbo.proxy.service;

import org.apache.dubbo.proxy.dao.ServiceDefinition;
import org.apache.dubbo.proxy.utils.ResultCode;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.registry.Registry;
import org.apache.dubbo.rpc.RpcContext;
import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.service.GenericService;
import org.slf4j.Logger;
Expand Down Expand Up @@ -37,8 +39,7 @@ private static void init() {
private static Logger logger = LoggerFactory.getLogger(GenericInvoke.class);

public static Object genericCall(String interfaceName, String group,
String version, String methodName, String[] paramTypes,
Object[] paramObjs) {
String version, ServiceDefinition serviceDefinition) {
if (init.compareAndSet(false, true)) {
init();
}
Expand All @@ -47,14 +48,18 @@ public static Object genericCall(String interfaceName, String group,

try {
GenericService svc = reference.get();
if (serviceDefinition.getAttachments() != null && !serviceDefinition.getAttachments().isEmpty()) {
RpcContext.getContext().setAttachments(serviceDefinition.getAttachments());
}
logger.info("dubbo generic invoke, service is {}, method is {} , paramTypes is {} , paramObjs is {} , svc" +
" is {}.", interfaceName

, methodName,paramTypes,paramObjs,svc);
return svc.$invoke(methodName, paramTypes, paramObjs);
} catch (Exception e) {
logger.error("Generic invoke failed",e);
logger.error("Generic invoke failed", e);
if (e instanceof RpcException) {
RpcException e1 = (RpcException)e;
RpcException e1 = (RpcException) e;
if (e1.isTimeout()) {
return ResultCode.TIMEOUT;
}
Expand All @@ -72,6 +77,7 @@ public static Object genericCall(String interfaceName, String group,
}
}


private static ReferenceConfig<GenericService> addNewReference(String interfaceName,
String group, String version) {
ReferenceConfig<GenericService> reference;
Expand All @@ -90,6 +96,7 @@ private static ReferenceConfig<GenericService> addNewReference(String interfaceN
return reference;
}


private static ReferenceConfig<GenericService> initReference(String interfaceName, String group,
String version) {
ReferenceConfig<GenericService> reference = new ReferenceConfig<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ public void run() {
Object result;
try {
result = GenericInvoke.genericCall(interfaze,group, version,
serviceDefinition.getMethodName(),
serviceDefinition.getParamTypes(), serviceDefinition.getParamValues());
serviceDefinition);
} catch (Exception e) {
e.printStackTrace();
result = e;
Expand Down