Skip to content

upgrade dubbo version to 2.7.7 #29

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.

Sign up for GitHub

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

Open
rocketk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

upgrade dubbo version to 2.7.7 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<slf4j.version>1.7.26</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<curator.version>2.12.0</curator.version>
<dubbo.version>2.7.3</dubbo.version>
<dubbo.version>2.7.7</dubbo.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/dubbo/proxy/metadata/MetadataCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.SPI;
import org.apache.dubbo.metadata.identifier.MetadataIdentifier;
import org.apache.dubbo.metadata.report.identifier.MetadataIdentifier;

@SPI("zookeeper")
public interface MetadataCollector {
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/apache/dubbo/proxy/metadata/impl/ZookeeperMetadataCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.apache.dubbo.proxy.metadata.impl;

import org.apache.dubbo.metadata.report.identifier.KeyTypeEnum;
import org.apache.dubbo.proxy.metadata.MetadataCollector;
import org.apache.dubbo.proxy.utils.Constants;
import org.apache.curator.framework.CuratorFramework;
Expand All @@ -8,7 +9,7 @@
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.metadata.identifier.MetadataIdentifier;
import org.apache.dubbo.metadata.report.identifier.MetadataIdentifier;

public class ZookeeperMetadataCollector implements MetadataCollector {

Expand Down Expand Up @@ -47,7 +48,7 @@ public String getProviderMetaData(MetadataIdentifier key) {
}

private String getNodePath(MetadataIdentifier metadataIdentifier) {
return toRootDir() + metadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.PATH) +
return toRootDir() + metadataIdentifier.getUniqueKey(KeyTypeEnum.PATH) +
Constants.PATH_SEPARATOR + METADATA_NODE_NAME;
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/apache/dubbo/proxy/service/GenericInvoke.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.apache.dubbo.proxy.service;

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.proxy.utils.ResultCode;
import org.apache.dubbo.registry.Registry;
import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.service.GenericService;
Expand Down Expand Up @@ -47,9 +47,8 @@ public static Object genericCall(String interfaceName, String group,

try {
GenericService svc = reference.get();
logger.info("dubbo generic invoke, service is {}, method is {} , paramTypes is {} , paramObjs is {} , svc" +
" is {}.", interfaceName
, methodName,paramTypes,paramObjs,svc);
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);
Expand All @@ -74,6 +73,7 @@ public static Object genericCall(String interfaceName, String group,

private static ReferenceConfig<GenericService> addNewReference(String interfaceName,
String group, String version) {

ReferenceConfig<GenericService> reference;
String cachedKey = interfaceName + group + version;
reference = cachedConfig.get(cachedKey);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/apache/dubbo/proxy/worker/RequestWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import io.netty.util.CharsetUtil;
import org.apache.dubbo.metadata.definition.model.FullServiceDefinition;
import org.apache.dubbo.metadata.definition.model.MethodDefinition;
import org.apache.dubbo.metadata.identifier.MetadataIdentifier;
import org.apache.dubbo.metadata.report.identifier.MetadataIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -72,7 +72,7 @@ public void run() {
serviceDefinition.getMethodName(),
serviceDefinition.getParamTypes(), serviceDefinition.getParamValues());
} catch (Exception e) {
e.printStackTrace();
// e.printStackTrace();
result = e;
}
if (!writeResponse(ctx, result)) {
Expand Down