From 2b8e9192155bd86842ac2c545cc7d3044ae653a0 Mon Sep 17 00:00:00 2001
From: sorie <gsoriee@gmail.com>
Date: Mon, 14 Mar 2022 21:49:54 +0800
Subject: [PATCH] Improve MockNamingService: return emptyList rather than null

---
 .../nacos/registry/MockNamingService.java     | 50 +++++++++++--------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/MockNamingService.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/MockNamingService.java
index ffca36079..45f6085ab 100644
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/MockNamingService.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/MockNamingService.java
@@ -16,6 +16,7 @@
 
 package com.alibaba.cloud.nacos.registry;
 
+import java.util.Collections;
 import java.util.List;
 
 import com.alibaba.nacos.api.exception.NacosException;
@@ -105,98 +106,98 @@ public class MockNamingService implements NamingService {
 
 	@Override
 	public List<Instance> getAllInstances(String serviceName) throws NacosException {
-		return null;
+		return Collections.emptyList();
 	}
 
 	@Override
 	public List<Instance> getAllInstances(String serviceName, String groupName)
 			throws NacosException {
-		return null;
+		return Collections.emptyList();
 	}
 
 	@Override
 	public List<Instance> getAllInstances(String serviceName, boolean subscribe)
 			throws NacosException {
-		return null;
+		return Collections.emptyList();
 	}
 
 	@Override
 	public List<Instance> getAllInstances(String serviceName, String groupName,
 			boolean subscribe) throws NacosException {
-		return null;
+		return Collections.emptyList();
 	}
 
 	@Override
 	public List<Instance> getAllInstances(String serviceName, List<String> clusters)
 			throws NacosException {
-		return null;
+		return Collections.emptyList();
 	}
 
 	@Override
 	public List<Instance> getAllInstances(String serviceName, String groupName,
 			List<String> clusters) throws NacosException {
-		return null;
+		return Collections.emptyList();
 	}
 
 	@Override
 	public List<Instance> getAllInstances(String serviceName, List<String> clusters,
 			boolean subscribe) throws NacosException {
-		return null;
+		return Collections.emptyList();
 	}
 
 	@Override
 	public List<Instance> getAllInstances(String serviceName, String groupName,
 			List<String> clusters, boolean subscribe) throws NacosException {
-		return null;
+		return Collections.emptyList();
 	}
 
 	@Override
 	public List<Instance> selectInstances(String serviceName, boolean healthy)
 			throws NacosException {
-		return null;
+		return Collections.emptyList();
 	}
 
 	@Override
 	public List<Instance> selectInstances(String serviceName, String groupName,
 			boolean healthy) throws NacosException {
-		return null;
+		return Collections.emptyList();
 	}
 
 	@Override
 	public List<Instance> selectInstances(String serviceName, boolean healthy,
 			boolean subscribe) throws NacosException {
-		return null;
+		return Collections.emptyList();
 	}
 
 	@Override
 	public List<Instance> selectInstances(String serviceName, String groupName,
 			boolean healthy, boolean subscribe) throws NacosException {
-		return null;
+		return Collections.emptyList();
 	}
 
 	@Override
 	public List<Instance> selectInstances(String serviceName, List<String> clusters,
 			boolean healthy) throws NacosException {
-		return null;
+		return Collections.emptyList();
 	}
 
 	@Override
 	public List<Instance> selectInstances(String serviceName, String groupName,
 			List<String> clusters, boolean healthy) throws NacosException {
-		return null;
+		return Collections.emptyList();
 	}
 
 	@Override
 	public List<Instance> selectInstances(String serviceName, List<String> clusters,
 			boolean healthy, boolean subscribe) throws NacosException {
-		return null;
+		return Collections.emptyList();
 	}
 
 	@Override
 	public List<Instance> selectInstances(String serviceName, String groupName,
 			List<String> clusters, boolean healthy, boolean subscribe)
 			throws NacosException {
-		return null;
+		return Collections.emptyList();
 	}
 
 	@Override
@@ -297,30 +298,30 @@ public class MockNamingService implements NamingService {
 	@Override
 	public ListView<String> getServicesOfServer(int pageNo, int pageSize)
 			throws NacosException {
-		return null;
+		return this.emptyListView();
 	}
 
 	@Override
 	public ListView<String> getServicesOfServer(int pageNo, int pageSize,
 			String groupName) throws NacosException {
-		return null;
+		return this.emptyListView();
 	}
 
 	@Override
 	public ListView<String> getServicesOfServer(int pageNo, int pageSize,
 			AbstractSelector selector) throws NacosException {
-		return null;
+		return this.emptyListView();
 	}
 
 	@Override
 	public ListView<String> getServicesOfServer(int pageNo, int pageSize,
 			String groupName, AbstractSelector selector) throws NacosException {
-		return null;
+		return this.emptyListView();
 	}
 
 	@Override
 	public List<ServiceInfo> getSubscribeServices() throws NacosException {
-		return null;
+		return Collections.emptyList();
 	}
 
 	@Override
@@ -332,5 +333,10 @@ public class MockNamingService implements NamingService {
 	public void shutDown() throws NacosException {
 
 	}
-
+	private ListView<String> emptyListView() {
+		ListView<String> emptyListView = new ListView<>();
+		emptyListView.setCount(0);
+		emptyListView.setData(Collections.emptyList());
+		return emptyListView;
+	}
 }