From 4a2f90f13e78d1a5dc8863f97c88a304b397a8ea Mon Sep 17 00:00:00 2001
From: theonefx <chenxilzx1@gmail.com>
Date: Thu, 28 Jan 2021 09:11:33 +0800
Subject: [PATCH] dubbo endpoint

---
 ...ubboMetadataEndpointAutoConfiguration.java |  8 ----
 .../endpoint/DubboDiscoveryEndpoint.java      |  5 +++
 .../endpoint/DubboRegistryEndpoint.java       | 42 -------------------
 3 files changed, 5 insertions(+), 50 deletions(-)
 delete mode 100644 spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/endpoint/DubboRegistryEndpoint.java

diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/DubboMetadataEndpointAutoConfiguration.java b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/DubboMetadataEndpointAutoConfiguration.java
index 16867eee..e95acddc 100644
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/DubboMetadataEndpointAutoConfiguration.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/DubboMetadataEndpointAutoConfiguration.java
@@ -17,7 +17,6 @@
 package com.alibaba.cloud.dubbo.actuate;
 
 import com.alibaba.cloud.dubbo.actuate.endpoint.DubboDiscoveryEndpoint;
-import com.alibaba.cloud.dubbo.actuate.endpoint.DubboRegistryEndpoint;
 import com.alibaba.cloud.dubbo.actuate.endpoint.DubboRestMetadataEndpoint;
 
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
@@ -52,11 +51,4 @@ public class DubboMetadataEndpointAutoConfiguration {
 		return new DubboDiscoveryEndpoint();
 	}
 
-	@Bean
-	@ConditionalOnMissingBean
-	@ConditionalOnAvailableEndpoint
-	public DubboRegistryEndpoint dubboRegistryEndpoint() {
-		return new DubboRegistryEndpoint();
-	}
-
 }
diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/endpoint/DubboDiscoveryEndpoint.java b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/endpoint/DubboDiscoveryEndpoint.java
index c8d818f6..9954b28a 100644
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/endpoint/DubboDiscoveryEndpoint.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/endpoint/DubboDiscoveryEndpoint.java
@@ -16,6 +16,7 @@
 
 package com.alibaba.cloud.dubbo.actuate.endpoint;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -50,6 +51,10 @@ public class DubboDiscoveryEndpoint {
 				.getRegistries().stream().filter(o -> o instanceof DubboCloudRegistry)
 				.findFirst().orElse(null);
 
+		if (registry == null) {
+			return Collections.emptyMap();
+		}
+
 		Map<URL, Set<NotifyListener>> map = registry.getSubscribed();
 
 		Map<String, List<String>> result = new HashMap<>();
diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/endpoint/DubboRegistryEndpoint.java b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/endpoint/DubboRegistryEndpoint.java
deleted file mode 100644
index 03ac3c95..00000000
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/endpoint/DubboRegistryEndpoint.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2013-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.alibaba.cloud.dubbo.actuate.endpoint;
-
-import com.alibaba.cloud.dubbo.registry.DubboCloudRegistry;
-
-import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
-import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
-
-import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-
-/**
- * Dubbo Rest Metadata {@link Endpoint}.
- *
- * @author <a href="mailto:chenxilzx1@gmail.com">Mercy</a>
- */
-@Endpoint(id = "dubboregistry")
-public class DubboRegistryEndpoint {
-
-	// @Autowired
-	private DubboCloudRegistry dubboCloudRegistry;
-
-	@ReadOperation(produces = APPLICATION_JSON_VALUE)
-	public Object get() {
-		return dubboCloudRegistry;
-	}
-
-}