[dubbo-proxy] branch master updated: code-style-refactor

[min]

This is an automated email from the ASF dual-hosted git repository.

min pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-proxy.git


The following commit(s) were added to refs/heads/master by this push:
     new 67d9b4f  code-style-refactor
     new 6130e36  Merge pull request #12 from qixiaobo/refactor-code-style
67d9b4f is described below

commit 67d9b4f18d47e4b321576917b720bd78d8a928fe
Author: qixiaobo <qixiaobo...@gmail.com>
AuthorDate: Fri Jul 26 15:01:18 2019 +0800

    code-style-refactor
---
 .../org/apache/dubbo/proxy/service/GenericInvoke.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

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 415fca4..2783361 100644
--- a/src/main/java/org/apache/dubbo/proxy/service/GenericInvoke.java
+++ b/src/main/java/org/apache/dubbo/proxy/service/GenericInvoke.java
@@ -24,7 +24,7 @@ public class GenericInvoke {
         GenericInvoke.registry = registry;
     }
 
-    public static void init() {
+    private static void init() {
         RegistryConfig registryConfig = new RegistryConfig();
         registryConfig.setAddress(registry.getUrl().getProtocol() + "://" + 
registry.getUrl().getAddress());
         applicationConfig = new ApplicationConfig();
@@ -32,7 +32,7 @@ public class GenericInvoke {
         applicationConfig.setRegistry(registryConfig);
     }
 
-    private static ConcurrentHashMap<String, ReferenceConfig> cachedConfig = 
new ConcurrentHashMap<>();
+    private static ConcurrentHashMap<String, ReferenceConfig<GenericService>> 
cachedConfig = new ConcurrentHashMap<>();
     private static Logger logger = 
LoggerFactory.getLogger(GenericInvoke.class);
 
     public static Object genericCall(String interfaceName, String group,
@@ -41,7 +41,7 @@ public class GenericInvoke {
         if (init.compareAndSet(false, true)) {
             init();
         }
-        ReferenceConfig<GenericService> reference = null;
+        ReferenceConfig<GenericService> reference;
         reference = addNewReference(interfaceName, group, version);
 
         try {
@@ -49,8 +49,7 @@ public class GenericInvoke {
             logger.info("dubbo generic invoke, service is {}, method is {} , 
paramTypes is {} , paramObjs is {} , svc" +
                             " is {}.", interfaceName
                     , methodName,paramTypes,paramObjs,svc);
-            Object result = svc.$invoke(methodName, paramTypes, paramObjs);
-            return result;
+            return svc.$invoke(methodName, paramTypes, paramObjs);
         } catch (Exception e) {
             logger.error("Generic invoke failed",e);
             if (e instanceof RpcException) {
@@ -72,9 +71,9 @@ public class GenericInvoke {
         }
     }
 
-    private static ReferenceConfig addNewReference(String interfaceName,
-                                                     String group, String 
version) {
-        ReferenceConfig reference;
+    private static ReferenceConfig<GenericService> addNewReference(String 
interfaceName,
+                                                                   String 
group, String version) {
+        ReferenceConfig<GenericService> reference;
         String cachedKey = interfaceName + group + version;
         reference = cachedConfig.get(cachedKey);
         if (reference == null) {
@@ -90,8 +89,8 @@ public class GenericInvoke {
         return reference;
     }
 
-    private static ReferenceConfig initReference(String interfaceName, String 
group,
-                                                String version) {
+    private static ReferenceConfig<GenericService> initReference(String 
interfaceName, String group,
+                                                                 String 
version) {
         ReferenceConfig<GenericService> reference = new ReferenceConfig<>();
         reference.setGeneric(true);
         reference.setApplication(applicationConfig);