Compare `ee2672c ... +10 ... a25eccf`

import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

public class AdminServiceInstancesChangedListener extends ServiceInstancesChangedListener {

    private AddressChangeListener addressChangeListener;

    private Map<String, Object> oldServiceUrls;
    private Map<String, List<ServiceInstancesChangedListener.ProtocolServiceKeyWithUrls>> oldServiceUrls;

    public AdminServiceInstancesChangedListener(Set<String> serviceNames, ServiceDiscovery serviceDiscovery, AddressChangeListener addressChangeListener) {
        super(serviceNames, serviceDiscovery);

@@ -43,8 +44,14 @@

        oldServiceUrls.keySet().stream()
                .filter(protocolServiceKey -> !serviceUrls.containsKey(protocolServiceKey))
                .forEach(protocolServiceKey -> addressChangeListener.notifyAddressChanged(protocolServiceKey, new ArrayList<>()));
        serviceUrls.forEach((protocolServiceKey, urls) -> addressChangeListener.notifyAddressChanged(protocolServiceKey, (List<URL>) urls));
        serviceUrls.forEach((protocolServiceKey, urls) -> addressChangeListener.notifyAddressChanged(protocolServiceKey, extractUrls(urls)));

        oldServiceUrls = serviceUrls;
    }

    private List<URL> extractUrls(List<ServiceInstancesChangedListener.ProtocolServiceKeyWithUrls> keyUrls) {
        return keyUrls.stream()
                .flatMap((protocolServiceKeyWithUrls) -> protocolServiceKeyWithUrls.getUrls().stream())
                .collect(Collectors.toList());
    }
}

@@ -97,7 +97,7 @@

        origin.keySet().forEach(providers::remove);

        for (List<InstanceAddressURL> instanceAddressURLs : providers.values()) {
            MetadataService metadataService = MetadataUtils.referProxy(instanceAddressURLs.get(0).getInstance());
            MetadataService metadataService = MetadataUtils.referProxy(instanceAddressURLs.get(0).getInstance()).getProxy();
            try {
                Set<String> subscribedURLs = metadataService.getSubscribedURLs();


@@ -105,6 +105,7 @@


        if (StringUtils.isNotEmpty(configCenter)) {
            configCenterUrl = formUrl(configCenter, configCenterGroup, configCenterGroupNameSpace, username, password);
            logger.info("Admin using config center: " + configCenterUrl);
            dynamicConfiguration = ExtensionLoader.getExtensionLoader(GovernanceConfiguration.class).getDefaultExtension();
            dynamicConfiguration.setUrl(configCenterUrl);
            dynamicConfiguration.init();

@@ -118,6 +119,8 @@

                    } else if (s.startsWith(Constants.METADATA_ADDRESS)) {
                        metadataUrl = formUrl(removerConfigKey(s), metadataGroup, metadataGroupNameSpace, username, password);
                    }
                    logger.info("Registry address found from config center: " + registryUrl);
                    logger.info("Metadata address found from config center: " + registryUrl);
                });
            }
        }

@@ -127,9 +130,9 @@

                dynamicConfiguration = ExtensionLoader.getExtensionLoader(GovernanceConfiguration.class).getDefaultExtension();
                dynamicConfiguration.setUrl(registryUrl);
                dynamicConfiguration.init();
                logger.warn("you are using dubbo.registry.address, which is not recommend, please refer to: https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin-configuration");
                logger.warn("you are using dubbo.registry.address, which is not recommend, please refer to: https://github.com/apache/dubbo-admin/wiki/Dubbo-Admin-configuration");
            } else {
                throw new ConfigurationException("Either config center or registry address is needed, please refer to https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin-configuration");
                throw new ConfigurationException("Either config center or registry address is needed, please refer to https://github.com/apache/dubbo-admin/wiki/Dubbo-Admin-configuration");
                //throw exception
            }
        }

@@ -145,10 +148,13 @@

        Registry registry = null;
        if (registryUrl == null) {
            if (StringUtils.isBlank(registryAddress)) {
                throw new ConfigurationException("Either config center or registry address is needed, please refer to https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin-configuration");
                throw new ConfigurationException("Either config center or registry address is needed, please refer to https://github.com/apache/dubbo-admin/wiki/Dubbo-Admin-configuration");
            }
            registryUrl = formUrl(registryAddress, registryGroup, registryNameSpace, username, password);
        }

        logger.info("Admin using registry address: " + registryUrl);

        RegistryFactory registryFactory = ApplicationModel.defaultModel().getExtensionLoader(RegistryFactory.class).getAdaptiveExtension();
        registry = registryFactory.getRegistry(registryUrl.addParameter(ENABLE_EMPTY_PROTECTION_KEY, String.valueOf(false)));
        return registry;

@@ -166,13 +172,14 @@

                metadataUrl = formUrl(metadataAddress, metadataGroup, metadataGroupNameSpace, username, password);
                metadataUrl = metadataUrl.addParameter(CLUSTER_KEY, cluster);
            }
            logger.info("Admin using metadata address: " + metadataUrl);
        }
        if (metadataUrl != null) {
            metaDataCollector = ApplicationModel.defaultModel().getExtensionLoader(MetaDataCollector.class).getExtension(metadataUrl.getProtocol());
            metaDataCollector.setUrl(metadataUrl);
            metaDataCollector.init();
        } else {
            logger.warn("you are using dubbo.registry.address, which is not recommend, please refer to: https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin-configuration");
            logger.warn("you are using dubbo.registry.address, which is not recommend, please refer to: https://github.com/apache/dubbo-admin/wiki/Dubbo-Admin-configuration");
        }
        return metaDataCollector;
    }

@@ -45,7 +45,7 @@

    private ApiInfo apiInfo() {
        return new ApiInfoBuilder()
                .title("dubbo admin swagger api")
                .description("for more information please visit github page: https://github.com/apache/incubator-dubbo-admin")
                .description("for more information please visit github page: https://github.com/apache/dubbo-admin")
                .version("1.0")
                .build();
    }

Learn more Showing 5 files with coverage changes found.

Changes in dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/RegistryServerSync.java

-2

-1

→

Loading file...

Changes in dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/MetricsCollectController.java

→

Loading file...

Changes in dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/RouteUtils.java

→

Loading file...

Changes in dubbo-admin-server/src/main/java/org/apache/dubbo/admin/registry/mapping/AdminMappingListener.java

New

Loading file...

Changes in dubbo-admin-server/src/main/java/org/apache/dubbo/admin/registry/mapping/impl/ZookeeperServiceMapping.java

-3

→

Loading file...

21.30% ø -0.04% 18.88% -0.04%

add dubbo-admin nacos (#972)

JSCZhongJian

a25eccf

CI Passed

-2

-1

21.34% ø ø 18.92% ø

Unable to find commit in GitHub

Unknown

085635d

21.34% ø +0.02% 18.92% +0.04%

change readme (#967)

JSCZhongJian

105f12a

CI Passed

-1

21.32% ø +0.02% 18.88% ø

initial docker (#964)

JSCZhongJian

4836ee0

CI Passed

-3

21.30% ø -0.04% 18.88% -0.04%

add storage (#963)

JSCZhongJian

f179042

CI Passed

-2

-1

83e293b

21.34% ø +0.04% 18.92% +0.04%

Update deployment (#960)

b0bf24a

-3

e279afd

21.30% ø -0.04% 18.88% -0.04%

Update README_ZH.md (#951)

wxbty

bd36d09

CI Passed

-2

-1

21.34% ø ø 18.92% ø

adjust port (#948)

RobberPhex

3ae9dfa

21.34% 93.33% +0.13% 18.92% +0.07%

Make Admin easier to deploy (#940)

chickenlj

290126c

CI Passed

+10

+11

-1

21.15% ø ø 18.79% ø

Unable to find commit in GitHub

Unknown

#935 ee2672c

Files		•	•	•	Complexity	Coverage
dubbo-admin-server/src/main/java/org/apache/dubbo/admin	+10	+9	-1	+2	^+5.00% 18.88%	^0.14% 21.30%
Project Totals (149 files)	4,799	1,022	84	3,693	18.88%	21.30%

105	105
106	106		if (StringUtils.isNotEmpty(configCenter)) {
107	107		configCenterUrl = formUrl(configCenter, configCenterGroup, configCenterGroupNameSpace, username, password);
	108	+	logger.info("Admin using config center: " + configCenterUrl);
108	109		dynamicConfiguration = ExtensionLoader.getExtensionLoader(GovernanceConfiguration.class).getDefaultExtension();
109	110		dynamicConfiguration.setUrl(configCenterUrl);
110	111		dynamicConfiguration.init();

118	119		} else if (s.startsWith(Constants.METADATA_ADDRESS)) {
119	120		metadataUrl = formUrl(removerConfigKey(s), metadataGroup, metadataGroupNameSpace, username, password);
120	121		}
	122	+	logger.info("Registry address found from config center: " + registryUrl);
	123	+	logger.info("Metadata address found from config center: " + registryUrl);
121	124		});
122	125		}
123	126		}

127	130		dynamicConfiguration = ExtensionLoader.getExtensionLoader(GovernanceConfiguration.class).getDefaultExtension();
128	131		dynamicConfiguration.setUrl(registryUrl);
129	132		dynamicConfiguration.init();
130		-	logger.warn("you are using dubbo.registry.address, which is not recommend, please refer to: https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin-configuration");
	133	+	logger.warn("you are using dubbo.registry.address, which is not recommend, please refer to: https://github.com/apache/dubbo-admin/wiki/Dubbo-Admin-configuration");
131	134		} else {
132		-	throw new ConfigurationException("Either config center or registry address is needed, please refer to https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin-configuration");
	135	+	throw new ConfigurationException("Either config center or registry address is needed, please refer to https://github.com/apache/dubbo-admin/wiki/Dubbo-Admin-configuration");
133	136		//throw exception
134	137		}
135	138		}

145	148		Registry registry = null;
146	149		if (registryUrl == null) {
147	150		if (StringUtils.isBlank(registryAddress)) {
148		-	throw new ConfigurationException("Either config center or registry address is needed, please refer to https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin-configuration");
	151	+	throw new ConfigurationException("Either config center or registry address is needed, please refer to https://github.com/apache/dubbo-admin/wiki/Dubbo-Admin-configuration");
149	152		}
150	153		registryUrl = formUrl(registryAddress, registryGroup, registryNameSpace, username, password);
151	154		}
	155	+
	156	+	logger.info("Admin using registry address: " + registryUrl);
	157	+
152	158		RegistryFactory registryFactory = ApplicationModel.defaultModel().getExtensionLoader(RegistryFactory.class).getAdaptiveExtension();
153	159		registry = registryFactory.getRegistry(registryUrl.addParameter(ENABLE_EMPTY_PROTECTION_KEY, String.valueOf(false)));
154	160		return registry;

166	172		metadataUrl = formUrl(metadataAddress, metadataGroup, metadataGroupNameSpace, username, password);
167	173		metadataUrl = metadataUrl.addParameter(CLUSTER_KEY, cluster);
168	174		}
	175	+	logger.info("Admin using metadata address: " + metadataUrl);
169	176		}
170	177		if (metadataUrl != null) {
171	178		metaDataCollector = ApplicationModel.defaultModel().getExtensionLoader(MetaDataCollector.class).getExtension(metadataUrl.getProtocol());
172	179		metaDataCollector.setUrl(metadataUrl);
173	180		metaDataCollector.init();
174	181		} else {
175		-	logger.warn("you are using dubbo.registry.address, which is not recommend, please refer to: https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin-configuration");
	182	+	logger.warn("you are using dubbo.registry.address, which is not recommend, please refer to: https://github.com/apache/dubbo-admin/wiki/Dubbo-Admin-configuration");
176	183		}
177	184		return metaDataCollector;
178	185		}

Compare `ee2672c ... +10 ... a25eccf`

Flags

12 Commits

26	26		import java.util.List;
27	27		import java.util.Map;
28	28		import java.util.Set;
	29	+	import java.util.stream.Collectors;
29	30
30	31		public class AdminServiceInstancesChangedListener extends ServiceInstancesChangedListener {
31	32
32	33		private AddressChangeListener addressChangeListener;
33	34
34		-	private Map<String, Object> oldServiceUrls;
	35	+	private Map<String, List<ServiceInstancesChangedListener.ProtocolServiceKeyWithUrls>> oldServiceUrls;
35	36
36	37		public AdminServiceInstancesChangedListener(Set<String> serviceNames, ServiceDiscovery serviceDiscovery, AddressChangeListener addressChangeListener) {
37	38		super(serviceNames, serviceDiscovery);

43	44		oldServiceUrls.keySet().stream()
44	45		.filter(protocolServiceKey -> !serviceUrls.containsKey(protocolServiceKey))
45	46		.forEach(protocolServiceKey -> addressChangeListener.notifyAddressChanged(protocolServiceKey, new ArrayList<>()));
46		-	serviceUrls.forEach((protocolServiceKey, urls) -> addressChangeListener.notifyAddressChanged(protocolServiceKey, (List<URL>) urls));
	47	+	serviceUrls.forEach((protocolServiceKey, urls) -> addressChangeListener.notifyAddressChanged(protocolServiceKey, extractUrls(urls)));
47	48
48	49		oldServiceUrls = serviceUrls;
49	50		}
	51	+
	52	+	private List<URL> extractUrls(List<ServiceInstancesChangedListener.ProtocolServiceKeyWithUrls> keyUrls) {
	53	+	return keyUrls.stream()
	54	+	.flatMap((protocolServiceKeyWithUrls) -> protocolServiceKeyWithUrls.getUrls().stream())
	55	+	.collect(Collectors.toList());
	56	+	}
50	57		}

97	97		origin.keySet().forEach(providers::remove);
98	98
99	99		for (List<InstanceAddressURL> instanceAddressURLs : providers.values()) {
100		-	MetadataService metadataService = MetadataUtils.referProxy(instanceAddressURLs.get(0).getInstance());
	100	+	MetadataService metadataService = MetadataUtils.referProxy(instanceAddressURLs.get(0).getInstance()).getProxy();
101	101		try {
102	102		Set<String> subscribedURLs = metadataService.getSubscribedURLs();
103	103

45	45		private ApiInfo apiInfo() {
46	46		return new ApiInfoBuilder()
47	47		.title("dubbo admin swagger api")
48		-	.description("for more information please visit github page: https://github.com/apache/incubator-dubbo-admin")
	48	+	.description("for more information please visit github page: https://github.com/apache/dubbo-admin")
49	49		.version("1.0")
50	50		.build();
51	51		}

Navigation	Overlay
`t` Navigate files	`h` Toggle hits
`y` Change url to tip of branch	`m` Toggle misses
`b / v` Jump to prev/next hit line	`p` Toggle partial
`z / x` Jump to prev/next missed or partial line	`1..9` Toggle flags
`shift + o` Open current page in GitHub	`a` Toggle all on
`/ or ?` Show keyboard shortcuts dialog	`c` Toggle context lines or commits

Compare ee2672c ... +10 ... a25eccf

Flags

12 Commits

Compare `ee2672c ... +10 ... a25eccf`