[incubator-dubbo-admin] branch develop updated: avoid redundant type info #392

[min]

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

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


The following commit(s) were added to refs/heads/develop by this push:
     new f8da6a8  avoid redundant type info #392
f8da6a8 is described below

commit f8da6a8608ab53b33023bb4e921384b27bf858b3
Author: nzomkxia <z82507...@gmail.com>
AuthorDate: Wed May 15 14:52:37 2019 +0800

    avoid redundant type info #392
---
 .../org/apache/dubbo/admin/common/util/OverrideUtils.java | 15 +++++++++++++++
 .../dubbo/admin/service/impl/OverrideServiceImpl.java     |  4 ++--
 dubbo-admin-ui/src/components/governance/LoadBalance.vue  | 12 ++++++------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git 
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java
 
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java
index 5ca8d9f..37e4ae8 100644
--- 
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java
+++ 
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java
@@ -44,6 +44,21 @@ public class OverrideUtils {
         return overrideConfig;
     }
 
+    public static OverrideConfig balancingDTOtoConfig(BalancingDTO 
balancingDTO) {
+        OverrideConfig overrideConfig = new OverrideConfig();
+        overrideConfig.setType(Constants.BALANCING);
+        overrideConfig.setEnabled(true);
+        overrideConfig.setSide(Constants.CONSUMER_SIDE);
+        Map<String, Object> parameters = new HashMap<>();
+        if (balancingDTO.getMethodName().equals("*")) {
+            parameters.put("loadbalance", balancingDTO.getStrategy());
+        } else {
+            parameters.put(balancingDTO.getMethodName() + ".loadbalance", 
balancingDTO.getStrategy());
+        }
+        overrideConfig.setParameters(parameters);
+        return overrideConfig;
+    }
+
     public static DynamicConfigDTO createFromOverride(OverrideDTO overrideDTO) 
{
         DynamicConfigDTO dynamicConfigDTO = new DynamicConfigDTO();
         dynamicConfigDTO.setConfigVersion(overrideDTO.getConfigVersion());
diff --git 
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
 
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
index bb8c725..454ad59 100644
--- 
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
+++ 
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
@@ -335,7 +335,7 @@ public class OverrideServiceImpl extends AbstractService 
implements OverrideServ
         String scope = ConvertUtil.getScopeFromDTO(balancingDTO);
         String path = getPath(id);
         String config = dynamicConfiguration.getConfig(path);
-        OverrideConfig overrideConfig = new 
BalancingDTO2OverrideConfigAdapter(balancingDTO);
+        OverrideConfig overrideConfig = 
OverrideUtils.balancingDTOtoConfig(balancingDTO);
         OverrideDTO overrideDTO = insertConfig(config, overrideConfig, id, 
scope, Constants.BALANCING);
         dynamicConfiguration.setConfig(path, 
YamlParser.dumpObject(overrideDTO));
 
@@ -363,7 +363,7 @@ public class OverrideServiceImpl extends AbstractService 
implements OverrideServ
                             oldBalancing = 
OverrideUtils.configtoBalancingDTO(overrideConfig, Constants.SERVICE, 
overrideDTO.getKey());
                         }
                         int index = configs.indexOf(overrideConfig);
-                        OverrideConfig newConfig = new 
BalancingDTO2OverrideConfigAdapter(balancingDTO);
+                        OverrideConfig newConfig = 
OverrideUtils.balancingDTOtoConfig(balancingDTO);
                         configs.set(index, newConfig);
                         break;
                     }
diff --git a/dubbo-admin-ui/src/components/governance/LoadBalance.vue 
b/dubbo-admin-ui/src/components/governance/LoadBalance.vue
index 7b62e00..905a790 100644
--- a/dubbo-admin-ui/src/components/governance/LoadBalance.vue
+++ b/dubbo-admin-ui/src/components/governance/LoadBalance.vue
@@ -387,12 +387,12 @@
                 if (response.status === 200) {
                   if (vm.service) {
                     vm.selected = 0
-                    vm.search(vm.service, true)
                     vm.filter = vm.service
+                    vm.search(true)
                   } else {
                     vm.selected = 1
-                    vm.search(vm.application, true)
                     vm.filter = vm.application
+                    vm.search(true)
                   }
                   this.closeDialog()
                   this.$notify.success('Update success')
@@ -405,12 +405,12 @@
               if (response.status === 201) {
                 if (vm.service) {
                   vm.selected = 0
-                  vm.search(vm.service, true)
                   vm.filter = vm.service
+                  vm.search(true)
                 } else {
                   vm.selected = 1
-                  vm.search(vm.application, true)
                   vm.filter = vm.application
+                  vm.search(true)
                 }
                 this.closeDialog()
                 this.$notify.success('Create success')
@@ -446,7 +446,7 @@
               })
             break
           case 'delete':
-            this.openWarn(' Are you sure to Delete Routing Rule', 'service: ' 
+ itemId)
+            this.openWarn('warnDeleteBalancing', 'service: ' + itemId)
             this.warnStatus.operation = 'delete'
             this.warnStatus.id = itemId
         }
@@ -471,7 +471,7 @@
           .then(response => {
             if (response.status === 200) {
               this.warn = false
-              this.search(this.filter, false)
+              this.search(false)
               this.$notify.success('Delete success')
             }
           })