[alibaba#1815]adjust and optimize codes, reput the lifecycle to Confi…

…gService class level at the same time.

api/src/main/java/com/alibaba/nacos/api/NacosFactory.java

@@ -98,4 +98,24 @@ public static NamingMaintainService createMaintainService(Properties properties)
         return NamingMaintainFactory.createMaintainService(properties);
     }
 
+    /**
+     * Destroy config service instance.
+     *
+     * @param configService
+     * @throws NacosException Exception.
+     */
+    public static void destroyConfigService(ConfigService configService) throws NacosException{
+        ConfigFactory.destroyConfigService(configService);
+    }
+
+    /**
+     * Destroy naming service instance.
+     *
+     * @param namingService
+     * @throws NacosException Exception.
+     */
+    public static void destroyNamingService(NamingService namingService) throws NacosException{
+        NamingFactory.destroyNamingService(namingService);
+    }
+
 }

api/src/main/java/com/alibaba/nacos/api/config/ConfigFactory.java

@@ -59,4 +59,19 @@ public static ConfigService createConfigService(String serverAddr) throws NacosE
         return createConfigService(properties);
     }
 
+    /**
+     * Destroy Config Instance's Resources.
+     *
+     * @param configService
+     * @throws NacosException
+     */
+    public static void destroyConfigService(ConfigService configService) throws NacosException{
+        try {
+            configService.shutDown();
+            configService = null;
+        }catch (Throwable e) {
+            throw new NacosException(NacosException.RESOURCE_DESTROY_FAILED, e);
+        }
+    }
+
 }

api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java

@@ -106,14 +106,9 @@ public interface ConfigService {
     String getServerStatus();
 
     /**
-     * Shutdown the resouces which are managed by config service object instance.
+     * Shutdown the resource service
      *
+     * @throws NacosException exception.
      */
-    /**
-     * Close the resouces which are managed by config service object instance.
-     *
-     * @throws Exception Exception occours when executing close operation.
-     */
-    void shutdown() throws Exception;
-
+    void shutDown() throws NacosException;
 }

api/src/main/java/com/alibaba/nacos/api/exception/NacosException.java

@@ -146,4 +146,9 @@ public String toString() {
 
 	public static final int RESOURCE_NOT_FOUND = -404;
 
+    /**
+     * resource instance destroy failed.
+     */
+	public static final int RESOURCE_DESTROY_FAILED = 410;
+
 }

api/src/main/java/com/alibaba/nacos/api/naming/NamingFactory.java

@@ -18,6 +18,7 @@
 import java.lang.reflect.Constructor;
 import java.util.Properties;
 
+import com.alibaba.nacos.api.config.ConfigService;
 import com.alibaba.nacos.api.exception.NacosException;
 
 /**
@@ -48,4 +49,19 @@ public static NamingService createNamingService(Properties properties) throws Na
             throw new NacosException(NacosException.CLIENT_INVALID_PARAM, e);
         }
     }
+
+    /**
+     * Destroy Config Instance's Resources.
+     *
+     * @param namingService
+     * @throws NacosException
+     */
+    public static void destroyNamingService(NamingService namingService) throws NacosException{
+        try {
+            namingService.shutDown();
+            namingService = null;
+        }catch (Throwable e) {
+            throw new NacosException(NacosException.RESOURCE_DESTROY_FAILED, e);
+        }
+    }
 }

api/src/main/java/com/alibaba/nacos/api/naming/NamingService.java

@@ -555,4 +555,11 @@ public interface NamingService {
      * @return is server healthy
      */
     String getServerStatus();
+
+    /**
+     * Shutdown the resource service.
+     *
+     * @throws NacosException exception.
+     */
+    void shutDown() throws NacosException;
 }

client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java

@@ -34,15 +34,13 @@
 import com.alibaba.nacos.client.utils.LogUtils;
 import com.alibaba.nacos.client.utils.ParamUtil;
 import com.alibaba.nacos.client.utils.ValidatorUtils;
-import com.alibaba.nacos.common.lifecycle.AbstractLifeCycle;
-import com.alibaba.nacos.common.lifecycle.LifeCycleState;
+import com.alibaba.nacos.common.lifecycle.LifeCycle;
 import com.alibaba.nacos.common.lifecycle.ResourceLifeCycleManager;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
-import java.rmi.server.ExportException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -54,7 +52,7 @@
  * @author Nacos
  */
 @SuppressWarnings("PMD.ServiceOrDaoClassShouldEndWithImplRule")
-public class NacosConfigService extends AbstractLifeCycle implements ConfigService {
+public class NacosConfigService implements ConfigService, LifeCycle {
 
     private static final Logger LOGGER = LogUtils.logger(NacosConfigService.class);
 
@@ -72,9 +70,9 @@ public class NacosConfigService extends AbstractLifeCycle implements ConfigServi
     private String encode;
     private ConfigFilterChainManager configFilterChainManager = new ConfigFilterChainManager();
 
-    public NacosConfigService(Properties properties) throws NacosException {
-        super();
+    private static final ResourceLifeCycleManager RESOURCE_MANAGER = ResourceLifeCycleManager.getInstance();
 
+    public NacosConfigService(Properties properties) throws NacosException {
         ValidatorUtils.checkInitParam(properties);
         String encodeTmp = properties.getProperty(PropertyKeyConst.ENCODE);
         if (StringUtils.isBlank(encodeTmp)) {
@@ -83,9 +81,11 @@ public NacosConfigService(Properties properties) throws NacosException {
             encode = encodeTmp.trim();
         }
         initNamespace(properties);
+
         agent = new MetricsHttpAgent(new ServerHttpAgent(properties));
         agent.fetchServerIpList();
         worker = new ClientWorker(agent, configFilterChainManager, properties);
+        RESOURCE_MANAGER.register(this);
     }
 
     private void initNamespace(Properties properties) {
@@ -288,16 +288,12 @@ public String getServerStatus() {
     }
 
     @Override
-    public void shutdown() throws Exception {
-        this.stop();
-    }
-
-    @Override
-    protected void doStart() throws Exception {
+    public void shutDown() throws NacosException{
+        destroy();
     }
 
     @Override
-    protected void doStop() throws Exception {
+    public void destroy() throws NacosException{
         this.agent.shutdown();
         this.worker.shutdown();
     }

client/src/main/java/com/alibaba/nacos/client/config/http/MetricsHttpAgent.java

@@ -34,6 +34,7 @@
  * @author Nacos
  */
 public class MetricsHttpAgent implements HttpAgent {
+
     private HttpAgent httpAgent;
 
     public MetricsHttpAgent(HttpAgent httpAgent) {
@@ -42,15 +43,15 @@ public MetricsHttpAgent(HttpAgent httpAgent) {
 
     @Override
     public void fetchServerIpList() throws NacosException {
-        httpAgent.fetchServerIpList();
+        this.httpAgent.fetchServerIpList();
     }
 
     @Override
     public HttpResult httpGet(String path, List<String> headers, List<String> paramValues, String encoding, long readTimeoutMs) throws IOException {
         Histogram.Timer timer = MetricsMonitor.getConfigRequestMonitor("GET", path, "NA");
         HttpResult result;
         try {
-            result = httpAgent.httpGet(path, headers, paramValues, encoding, readTimeoutMs);
+            result = this.httpAgent.httpGet(path, headers, paramValues, encoding, readTimeoutMs);
         } catch (IOException e) {
             throw e;
         } finally {
@@ -66,7 +67,7 @@ public HttpResult httpPost(String path, List<String> headers, List<String> param
         Histogram.Timer timer = MetricsMonitor.getConfigRequestMonitor("POST", path, "NA");
         HttpResult result;
         try {
-            result = httpAgent.httpPost(path, headers, paramValues, encoding, readTimeoutMs);
+            result = this.httpAgent.httpPost(path, headers, paramValues, encoding, readTimeoutMs);
         } catch (IOException e) {
             throw e;
         } finally {
@@ -82,7 +83,7 @@ public HttpResult httpDelete(String path, List<String> headers, List<String> par
         Histogram.Timer timer = MetricsMonitor.getConfigRequestMonitor("DELETE", path, "NA");
         HttpResult result;
         try {
-            result = httpAgent.httpDelete(path, headers, paramValues, encoding, readTimeoutMs);
+            result = this.httpAgent.httpDelete(path, headers, paramValues, encoding, readTimeoutMs);
         } catch (IOException e) {
 
             throw e;
@@ -96,32 +97,27 @@ public HttpResult httpDelete(String path, List<String> headers, List<String> par
 
     @Override
     public String getName() {
-        return httpAgent.getName();
+        return this.httpAgent.getName();
     }
 
     @Override
     public String getNamespace() {
-        return httpAgent.getNamespace();
+        return this.httpAgent.getNamespace();
     }
 
     @Override
     public String getTenant() {
-        return httpAgent.getTenant();
+        return this.httpAgent.getTenant();
     }
 
     @Override
     public String getEncode() {
-        return httpAgent.getEncode();
-    }
-
-    @Override
-    public void close() throws IOException {
-
+        return this.httpAgent.getEncode();
     }
 
     @Override
-    public void shutdown() throws InterruptedException {
-        httpAgent.shutdown();
+    public void shutdown() throws NacosException{
+        this.httpAgent.shutdown();
     }
 }