Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #7001] keep the count value in Nacos 2.x same with value Nacos 1.x . #7064

Merged
merged 1 commit into from
Oct 18, 2021
Merged

[ISSUE #7001] keep the count value in Nacos 2.x same with value Nacos 1.x . #7064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import com.alibaba.nacos.naming.pojo.Subscriber;
import com.alibaba.nacos.naming.selector.NoneSelector;
import com.alibaba.nacos.naming.selector.SelectorManager;
import com.alibaba.nacos.naming.utils.ServiceUtil;
import com.alibaba.nacos.naming.web.NamingResourceParser;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
Expand Down Expand Up @@ -164,17 +165,15 @@ public ObjectNode detail(@RequestParam(defaultValue = Constants.DEFAULT_NAMESPAC
@GetMapping("/list")
@Secured(parser = NamingResourceParser.class, action = ActionTypes.READ)
public ObjectNode list(HttpServletRequest request) throws Exception {

final int pageNo = NumberUtils.toInt(WebUtils.required(request, "pageNo"));
final int pageSize = NumberUtils.toInt(WebUtils.required(request, "pageSize"));
String namespaceId = WebUtils.optional(request, CommonParams.NAMESPACE_ID, Constants.DEFAULT_NAMESPACE_ID);
String groupName = WebUtils.optional(request, CommonParams.GROUP_NAME, Constants.DEFAULT_GROUP);
String selectorString = WebUtils.optional(request, "selector", StringUtils.EMPTY);
ObjectNode result = JacksonUtils.createEmptyJsonNode();
List<String> serviceNameList = getServiceOperator()
.listService(namespaceId, groupName, selectorString, pageSize, pageNo);
result.replace("doms", JacksonUtils.transferToJsonNode(serviceNameList));
Collection<String> serviceNameList = getServiceOperator().listService(namespaceId, groupName, selectorString);
result.put("count", serviceNameList.size());
result.replace("doms", JacksonUtils.transferToJsonNode(ServiceUtil.pageServiceName(pageNo, pageSize, serviceNameList)));
return result;

}
Expand Down
7 changes: 3 additions & 4 deletions naming/src/main/java/com/alibaba/nacos/naming/controllers/UpgradeOpsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import com.alibaba.nacos.naming.pojo.instance.HttpRequestInstanceBuilder;
import com.alibaba.nacos.naming.selector.NoneSelector;
import com.alibaba.nacos.naming.selector.SelectorManager;
import com.alibaba.nacos.naming.utils.ServiceUtil;
import com.alibaba.nacos.naming.web.CanDistro;
import com.alibaba.nacos.naming.web.NamingResourceParser;
import com.fasterxml.jackson.databind.JsonNode;
Expand All @@ -68,7 +69,6 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
Expand Down Expand Up @@ -304,10 +304,9 @@ public ObjectNode listService(@RequestParam(defaultValue = "v2", required = fals
String groupName = WebUtils.optional(request, CommonParams.GROUP_NAME, Constants.DEFAULT_GROUP);
String selectorString = WebUtils.optional(request, "selector", StringUtils.EMPTY);
ObjectNode result = JacksonUtils.createEmptyJsonNode();
List<String> serviceNameList = getServiceOperator(ver)
.listService(namespaceId, groupName, selectorString, pageSize, pageNo);
result.replace("doms", JacksonUtils.transferToJsonNode(serviceNameList));
Collection<String> serviceNameList = getServiceOperator(ver).listService(namespaceId, groupName, selectorString);
result.put("count", serviceNameList.size());
result.replace("doms", JacksonUtils.transferToJsonNode(ServiceUtil.pageServiceName(pageNo, pageSize, serviceNameList)));
return result;
}

Expand Down
6 changes: 1 addition & 5 deletions naming/src/main/java/com/alibaba/nacos/naming/core/ServiceOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.fasterxml.jackson.databind.node.ObjectNode;

import java.util.Collection;
import java.util.List;

/**
* Service operator.
Expand Down Expand Up @@ -76,13 +75,10 @@ public interface ServiceOperator {
* @param namespaceId namespace id of services
* @param groupName group name of services
* @param selector selector
* @param pageSize page size
* @param pageNo page number
* @return services name list
* @throws NacosException nacos exception during query
*/
List<String> listService(String namespaceId, String groupName, String selector, int pageSize, int pageNo)
throws NacosException;
Collection<String> listService(String namespaceId, String groupName, String selector) throws NacosException;

/**
* list All service namespace.
Expand Down
5 changes: 2 additions & 3 deletions naming/src/main/java/com/alibaba/nacos/naming/core/ServiceOperatorV1Impl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ public ObjectNode queryService(String namespaceId, String serviceName) throws Na
}

@Override
public List<String> listService(String namespaceId, String groupName, String selector, int pageSize, int pageNo)
throws NacosException {
public Collection<String> listService(String namespaceId, String groupName, String selector) throws NacosException {
Map<String, com.alibaba.nacos.naming.core.Service> serviceMap = serviceManager.chooseServiceMap(namespaceId);
if (serviceMap == null || serviceMap.isEmpty()) {
return Collections.emptyList();
Expand All @@ -134,7 +133,7 @@ public List<String> listService(String namespaceId, String groupName, String sel
serviceMap.entrySet()
.removeIf(entry -> !entry.getKey().startsWith(groupName + Constants.SERVICE_INFO_SPLITER));
}
return ServiceUtil.pageServiceName(pageNo, pageSize, serviceMap);
return serviceMap.keySet();
}

@Override
Expand Down
7 changes: 2 additions & 5 deletions naming/src/main/java/com/alibaba/nacos/naming/core/ServiceOperatorV2Impl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,13 @@
import com.alibaba.nacos.naming.core.v2.metadata.NamingMetadataOperateService;
import com.alibaba.nacos.naming.core.v2.metadata.ServiceMetadata;
import com.alibaba.nacos.naming.core.v2.pojo.Service;
import com.alibaba.nacos.naming.utils.ServiceUtil;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.springframework.stereotype.Component;

import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;

/**
Expand Down Expand Up @@ -136,15 +134,14 @@ private ObjectNode newClusterNode(String clusterName, ClusterMetadata clusterMet

@Override
@SuppressWarnings("unchecked")
public List<String> listService(String namespaceId, String groupName, String selector, int pageSize, int pageNo)
public Collection<String> listService(String namespaceId, String groupName, String selector)
throws NacosException {
Collection<Service> services = ServiceManager.getInstance().getSingletons(namespaceId);
if (services.isEmpty()) {
return Collections.EMPTY_LIST;
}
Collection<String> serviceNameSet = selectServiceWithGroupName(services, groupName);
// TODO select service by selector
return ServiceUtil.pageServiceName(pageNo, pageSize, serviceNameSet);
return selectServiceWithGroupName(services, groupName);
}

private Collection<String> selectServiceWithGroupName(Collection<Service> serviceSet, String groupName) {
Expand Down
2 changes: 1 addition & 1 deletion naming/src/test/java/com/alibaba/nacos/naming/controllers/ServiceControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void before() {
@Test
public void testList() throws Exception {

Mockito.when(serviceOperatorV2.listService(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyInt(), Mockito.anyInt()))
Mockito.when(serviceOperatorV2.listService(Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
.thenReturn(Collections.singletonList("DEFAULT_GROUP@@providers:com.alibaba.nacos.controller.test:1"));

MockHttpServletRequest servletRequest = new MockHttpServletRequest();
Expand Down
3 changes: 1 addition & 2 deletions naming/src/test/java/com/alibaba/nacos/naming/core/ServiceOperatorV2ImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

Expand Down Expand Up @@ -123,7 +122,7 @@ public void testQueryService() throws NacosException {

@Test
public void testListService() throws NacosException {
List<String> res = serviceOperatorV2.listService("A", "B", null, 10, 1);
Collection<String> res = serviceOperatorV2.listService("A", "B", null);
Assert.assertEquals(1, res.size());
}

Expand Down