重构类结构

discovery-plugin-admin-center/src/main/java/com/nepxion/discovery/plugin/admincenter/endpoint/ConfigEndpoint.java

@@ -89,24 +89,7 @@ public class ConfigEndpoint {
     @ResponseBody
     @ManagedOperation
     public ResponseEntity<List<String>> view() {
-        List<String> ruleList = new ArrayList<String>(2);
-
-        String localRuleContent = StringUtils.EMPTY;
-        RuleEntity localRuleEntity = pluginAdapter.getLocalRule();
-        if (localRuleEntity != null && StringUtils.isNotEmpty(localRuleEntity.getContent())) {
-            localRuleContent = localRuleEntity.getContent();
-        }
-
-        String dynamicRuleContent = StringUtils.EMPTY;
-        RuleEntity dynamicRuleEntity = pluginAdapter.getDynamicRule();
-        if (dynamicRuleEntity != null && StringUtils.isNotEmpty(dynamicRuleEntity.getContent())) {
-            dynamicRuleContent = dynamicRuleEntity.getContent();
-        }
-
-        ruleList.add(localRuleContent);
-        ruleList.add(dynamicRuleContent);
-
-        return ResponseEntity.ok().body(ruleList);
+        return view(false);
     }
 
     private ResponseEntity<?> update(String config, boolean async) {
@@ -145,6 +128,27 @@ public class ConfigEndpoint {
         return ResponseEntity.ok().body("OK");
     }
 
+    private ResponseEntity<List<String>> view(boolean async) {
+        List<String> ruleList = new ArrayList<String>(2);
+
+        String localRuleContent = StringUtils.EMPTY;
+        RuleEntity localRuleEntity = pluginAdapter.getLocalRule();
+        if (localRuleEntity != null && StringUtils.isNotEmpty(localRuleEntity.getContent())) {
+            localRuleContent = localRuleEntity.getContent();
+        }
+
+        String dynamicRuleContent = StringUtils.EMPTY;
+        RuleEntity dynamicRuleEntity = pluginAdapter.getDynamicRule();
+        if (dynamicRuleEntity != null && StringUtils.isNotEmpty(dynamicRuleEntity.getContent())) {
+            dynamicRuleContent = dynamicRuleEntity.getContent();
+        }
+
+        ruleList.add(localRuleContent);
+        ruleList.add(dynamicRuleContent);
+
+        return ResponseEntity.ok().body(ruleList);
+    }
+
     protected ResponseEntity<String> toExceptionResponseEntity(Exception e, boolean showDetail) {
         String message = null;
         if (showDetail) {

discovery-plugin-admin-center/src/main/java/com/nepxion/discovery/plugin/admincenter/endpoint/VersionEndpoint.java

@@ -88,15 +88,7 @@ public class VersionEndpoint {
     @ResponseBody
     @ManagedOperation
     public ResponseEntity<List<String>> view() {
-        List<String> versionList = new ArrayList<String>(2);
-
-        String localVersion = pluginAdapter.getLocalVersion();
-        String dynamicVersion = pluginAdapter.getDynamicVersion();
-
-        versionList.add(StringUtils.isNotEmpty(localVersion) ? localVersion : StringUtils.EMPTY);
-        versionList.add(StringUtils.isNotEmpty(dynamicVersion) ? dynamicVersion : StringUtils.EMPTY);
-
-        return ResponseEntity.ok().body(versionList);
+        return view(false);
     }
 
     private ResponseEntity<?> update(String version, boolean async) {
@@ -141,4 +133,16 @@ public class VersionEndpoint {
 
         return ResponseEntity.ok().body("OK");
     }
+
+    private ResponseEntity<List<String>> view(boolean async) {
+        List<String> versionList = new ArrayList<String>(2);
+
+        String localVersion = pluginAdapter.getLocalVersion();
+        String dynamicVersion = pluginAdapter.getDynamicVersion();
+
+        versionList.add(StringUtils.isNotEmpty(localVersion) ? localVersion : StringUtils.EMPTY);
+        versionList.add(StringUtils.isNotEmpty(dynamicVersion) ? dynamicVersion : StringUtils.EMPTY);
+
+        return ResponseEntity.ok().body(versionList);
+    }
 }
\ No newline at end of file