You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by mi...@apache.org on 2018/11/30 09:36:31 UTC
[incubator-dubbo-ops] branch metadata updated: optimize tag router
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/metadata by this push:
new 03cdd04 optimize tag router
03cdd04 is described below
commit 03cdd0454bf2ac14dab02f67b4a03bb5f7b9089d
Author: nzomkxia <z8...@gmail.com>
AuthorDate: Fri Nov 30 17:36:21 2018 +0800
optimize tag router
---
.../apache/dubbo/admin/controller/TagRoutesController.java | 11 +++++++----
.../main/java/org/apache/dubbo/admin/model/domain/Tag.java | 13 +++++--------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/TagRoutesController.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/TagRoutesController.java
index 8c3d273..88a918a 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/TagRoutesController.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/TagRoutesController.java
@@ -11,6 +11,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
+import java.util.List;
+
@RestController
@RequestMapping("/api/{env}/rules/route/tag")
public class TagRoutesController {
@@ -47,17 +50,17 @@ public class TagRoutesController {
}
@RequestMapping(method = RequestMethod.GET)
- public TagRouteDTO searchRoutes(@RequestParam String application, @PathVariable String env) {
+ public List<TagRouteDTO> searchRoutes(@RequestParam String application, @PathVariable String env) {
+ List<TagRouteDTO> result = new ArrayList<>();
TagRoute tagRoute = null;
if (StringUtils.isNotEmpty(application)) {
tagRoute = routeService.findTagRoute(application);
}
if (tagRoute != null) {
TagRouteDTO routeDTO = convertTagRouteToTagRouteDTO(tagRoute);
- return routeDTO;
+ result.add(routeDTO);
}
- return null;
-
+ return result;
}
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Tag.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Tag.java
index aed9abf..de0ba6d 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Tag.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Tag.java
@@ -1,11 +1,8 @@
package org.apache.dubbo.admin.model.domain;
-/**
- * @author zmx ON 2018/11/28
- */
public class Tag {
String name;
- String[] address;
+ String[] addresses;
public String getName() {
return name;
@@ -15,11 +12,11 @@ public class Tag {
this.name = name;
}
- public String[] getAddress() {
- return address;
+ public String[] getAddresses() {
+ return addresses;
}
- public void setAddress(String[] address) {
- this.address = address;
+ public void setAddresses(String[] addresses) {
+ this.addresses = addresses;
}
}