diff --git a/pom.xml b/pom.xml
index e5a9933..33cfb7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
1.7.26
1.2.17
2.12.0
- 2.7.3
+ 2.7.7
diff --git a/src/main/java/org/apache/dubbo/proxy/metadata/MetadataCollector.java b/src/main/java/org/apache/dubbo/proxy/metadata/MetadataCollector.java
index f5c2709..c0e6c77 100644
--- a/src/main/java/org/apache/dubbo/proxy/metadata/MetadataCollector.java
+++ b/src/main/java/org/apache/dubbo/proxy/metadata/MetadataCollector.java
@@ -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 {
diff --git a/src/main/java/org/apache/dubbo/proxy/metadata/impl/ZookeeperMetadataCollector.java b/src/main/java/org/apache/dubbo/proxy/metadata/impl/ZookeeperMetadataCollector.java
index 7f08ddd..c6e0e0d 100644
--- a/src/main/java/org/apache/dubbo/proxy/metadata/impl/ZookeeperMetadataCollector.java
+++ b/src/main/java/org/apache/dubbo/proxy/metadata/impl/ZookeeperMetadataCollector.java
@@ -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;
@@ -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 {
@@ -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;
}
diff --git a/src/main/java/org/apache/dubbo/proxy/service/GenericInvoke.java b/src/main/java/org/apache/dubbo/proxy/service/GenericInvoke.java
index eccdcd8..8e67945 100644
--- a/src/main/java/org/apache/dubbo/proxy/service/GenericInvoke.java
+++ b/src/main/java/org/apache/dubbo/proxy/service/GenericInvoke.java
@@ -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;
@@ -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);
@@ -74,6 +73,7 @@ public static Object genericCall(String interfaceName, String group,
private static ReferenceConfig addNewReference(String interfaceName,
String group, String version) {
+
ReferenceConfig reference;
String cachedKey = interfaceName + group + version;
reference = cachedConfig.get(cachedKey);
diff --git a/src/main/java/org/apache/dubbo/proxy/worker/RequestWorker.java b/src/main/java/org/apache/dubbo/proxy/worker/RequestWorker.java
index cc89b83..37b312f 100644
--- a/src/main/java/org/apache/dubbo/proxy/worker/RequestWorker.java
+++ b/src/main/java/org/apache/dubbo/proxy/worker/RequestWorker.java
@@ -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;
@@ -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)) {