You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by cr...@apache.org on 2022/05/19 12:39:30 UTC
[dubbo] branch 3.0 updated: [3.0] Optimization code (#10034)
This is an automated email from the ASF dual-hosted git repository.
crazyhzm pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new be7dc7f397 [3.0] Optimization code (#10034)
be7dc7f397 is described below
commit be7dc7f397ce66b2240bc2534128e6ddddda9688
Author: Oliver <wq...@163.com>
AuthorDate: Thu May 19 20:39:17 2022 +0800
[3.0] Optimization code (#10034)
* add override
* replace with lambda
* correct parameter order
* correct modifier order
* correct parameter order
* correct modifier order
* correct parameter order
* correct parameter order
* correct modifier order
---
.../registry/client/AbstractServiceDiscovery.java | 1 +
.../registry/client/DefaultServiceInstance.java | 2 ++
.../dubbo/registry/client/ServiceDiscovery.java | 2 ++
.../DefaultMigrationAddressComparator.java | 1 +
.../client/migration/MigrationClusterInvoker.java | 1 +
.../support/DefaultProviderFirstParams.java | 2 +-
.../AbstractServiceDiscoveryFactoryTest.java | 2 +-
.../StandardMetadataServiceURLBuilderTest.java | 38 +++++++++++-----------
.../client/migration/model/MigrationRuleTest.java | 2 +-
.../registry/multicast/MulticastRegistry.java | 35 +++++++++-----------
.../dubbo/registry/multiple/MultipleRegistry.java | 4 +--
.../dubbo/registry/nacos/NacosRegistryTest.java | 28 ++++++++--------
.../registry/zookeeper/ZookeeperRegistry.java | 4 +--
13 files changed, 63 insertions(+), 59 deletions(-)
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java
index eb44d8c9d6..cbcb8c6dd1 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java
@@ -86,6 +86,7 @@ public abstract class AbstractServiceDiscovery implements ServiceDiscovery {
.getBean(FrameworkExecutorRepository.class).getCacheRefreshingScheduledExecutor());
}
+ @Override
public synchronized void register() throws RuntimeException {
this.serviceInstance = createServiceInstance(this.metadataInfo);
if (!isValidInstance(this.serviceInstance)) {
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java
index 49b8687d92..66609278d1 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java
@@ -273,10 +273,12 @@ public class DefaultServiceInstance implements ServiceInstance {
this.metadata = metadata;
}
+ @Override
public MetadataInfo getServiceMetadata() {
return serviceMetadata;
}
+ @Override
public void setServiceMetadata(MetadataInfo serviceMetadata) {
this.serviceMetadata = serviceMetadata;
this.instanceAddressURL = null;
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscovery.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscovery.java
index fb0278ee80..3a4a3625f5 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscovery.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscovery.java
@@ -95,5 +95,7 @@ public interface ServiceDiscovery extends RegistryService, Prioritized {
*
* @return The description.
*/
+
+ @Override
String toString();
}
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/DefaultMigrationAddressComparator.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/DefaultMigrationAddressComparator.java
index 72e105339a..331053f2fb 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/DefaultMigrationAddressComparator.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/DefaultMigrationAddressComparator.java
@@ -100,6 +100,7 @@ public class DefaultMigrationAddressComparator implements MigrationAddressCompar
return CollectionUtils.isNotEmpty(invokers) ? invokers.size() : 0;
}
+ @Override
public Map<String, Integer> getAddressSize(String displayServiceKey) {
return serviceMigrationData.get(displayServiceKey);
}
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationClusterInvoker.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationClusterInvoker.java
index 4d1958fd88..948f3fb757 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationClusterInvoker.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationClusterInvoker.java
@@ -28,6 +28,7 @@ import org.apache.dubbo.rpc.cluster.ClusterInvoker;
*/
public interface MigrationClusterInvoker<T> extends ClusterInvoker<T> {
+ @Override
boolean isServiceDiscovery();
MigrationStep getMigrationStep();
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/DefaultProviderFirstParams.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/DefaultProviderFirstParams.java
index 6079ad92df..cae73df67f 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/DefaultProviderFirstParams.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/DefaultProviderFirstParams.java
@@ -30,7 +30,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.TAG_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.TIMESTAMP_KEY;
public class DefaultProviderFirstParams implements ProviderFirstParams {
- private final static Set<String> PARAMS = Collections.unmodifiableSet(new HashSet<String>() {{
+ private static final Set<String> PARAMS = Collections.unmodifiableSet(new HashSet<String>() {{
addAll(Arrays.asList(RELEASE_KEY, DUBBO_VERSION_KEY, METHODS_KEY, TIMESTAMP_KEY, TAG_KEY));
}});
diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/AbstractServiceDiscoveryFactoryTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/AbstractServiceDiscoveryFactoryTest.java
index 724cea336d..c15f086da0 100644
--- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/AbstractServiceDiscoveryFactoryTest.java
+++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/AbstractServiceDiscoveryFactoryTest.java
@@ -45,7 +45,7 @@ public class AbstractServiceDiscoveryFactoryTest {
AbstractServiceDiscoveryFactory abstractServiceDiscoveryFactory = (AbstractServiceDiscoveryFactory) factory;
List<ServiceDiscovery> allServiceDiscoveries = abstractServiceDiscoveryFactory.getAllServiceDiscoveries();
- Assertions.assertEquals(allServiceDiscoveries.size(), 2);
+ Assertions.assertEquals(2, allServiceDiscoveries.size());
Assertions.assertTrue(allServiceDiscoveries.contains(serviceDiscovery1));
Assertions.assertTrue(allServiceDiscoveries.contains(serviceDiscovery3));
}
diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/StandardMetadataServiceURLBuilderTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/StandardMetadataServiceURLBuilderTest.java
index b297f1c3f2..91350da89e 100644
--- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/StandardMetadataServiceURLBuilderTest.java
+++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/StandardMetadataServiceURLBuilderTest.java
@@ -59,31 +59,31 @@ public class StandardMetadataServiceURLBuilderTest {
List<URL> urls = builder.build(new DefaultServiceInstance("test", "127.0.0.1", 8080, ApplicationModel.defaultModel()));
assertEquals(1, urls.size());
URL url = urls.get(0);
- assertEquals(url.getProtocol(), "dubbo");
- assertEquals(url.getHost(), "127.0.0.1");
- assertEquals(url.getPort(), 7001);
- assertEquals(url.getServiceInterface(), MetadataService.class.getName());
- assertEquals(url.getGroup(), "test");
- assertEquals(url.getSide(), "consumer");
- assertEquals(url.getVersion(), "1.0.0");
+ assertEquals("dubbo", url.getProtocol());
+ assertEquals("127.0.0.1", url.getHost());
+ assertEquals(7001, url.getPort());
+ assertEquals(MetadataService.class.getName(), url.getServiceInterface());
+ assertEquals("test", url.getGroup());
+ assertEquals("consumer", url.getSide());
+ assertEquals("1.0.0", url.getVersion());
// assertEquals(url.getParameters().get("getAndListenInstanceMetadata.1.callback"), "true");
- assertEquals(url.getParameters().get("reconnect"), "false");
- assertEquals(url.getParameters().get("timeout"), "5000");
- assertEquals(url.getApplicationModel(), ApplicationModel.defaultModel());
+ assertEquals("false", url.getParameters().get("reconnect"));
+ assertEquals("5000", url.getParameters().get("timeout"));
+ assertEquals(ApplicationModel.defaultModel(), url.getApplicationModel());
// test generateWithMetadata
urls = builder.build(serviceInstance);
assertEquals(1, urls.size());
url = urls.get(0);
- assertEquals(url.getProtocol(), "rest");
- assertEquals(url.getHost(), "127.0.0.1");
- assertEquals(url.getPort(), 20880);
- assertEquals(url.getServiceInterface(), MetadataService.class.getName());
- assertEquals(url.getGroup(), "test");
- assertEquals(url.getSide(), "consumer");
- assertEquals(url.getVersion(), "1.0.0");
- assertEquals(url.getApplication(), "dubbo-provider-demo");
- assertEquals(url.getParameters().get("timeout"), "5000");
+ assertEquals("rest", url.getProtocol());
+ assertEquals("127.0.0.1", url.getHost());
+ assertEquals(20880, url.getPort());
+ assertEquals(MetadataService.class.getName(), url.getServiceInterface());
+ assertEquals("test", url.getGroup());
+ assertEquals("consumer", url.getSide());
+ assertEquals("1.0.0", url.getVersion());
+ assertEquals("dubbo-provider-demo", url.getApplication());
+ assertEquals("5000", url.getParameters().get("timeout"));
}
}
diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/model/MigrationRuleTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/model/MigrationRuleTest.java
index 7073c8d8fe..daf4052d62 100644
--- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/model/MigrationRuleTest.java
+++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/model/MigrationRuleTest.java
@@ -82,7 +82,7 @@ public class MigrationRuleTest {
Mockito.when(url.getParameter(ArgumentMatchers.eq(REGISTRY_CLUSTER_TYPE_KEY), anyString())).thenReturn("default");
Mockito.when(url.getParameter(ArgumentMatchers.eq(REGISTRY_CLUSTER_TYPE_KEY), anyString())).thenReturn("default");
- assertEquals(migrationRule.getInterfaces().size(), 2);
+ assertEquals(2, migrationRule.getInterfaces().size());
assertEquals(0.5f, migrationRule.getThreshold(url));
assertEquals(30, migrationRule.getProportion(url));
diff --git a/dubbo-registry/dubbo-registry-multicast/src/main/java/org/apache/dubbo/registry/multicast/MulticastRegistry.java b/dubbo-registry/dubbo-registry-multicast/src/main/java/org/apache/dubbo/registry/multicast/MulticastRegistry.java
index 996d7a9b24..689d3c81d8 100644
--- a/dubbo-registry/dubbo-registry-multicast/src/main/java/org/apache/dubbo/registry/multicast/MulticastRegistry.java
+++ b/dubbo-registry/dubbo-registry-multicast/src/main/java/org/apache/dubbo/registry/multicast/MulticastRegistry.java
@@ -107,25 +107,22 @@ public class MulticastRegistry extends FailbackRegistry {
multicastPort = url.getPort() <= 0 ? DEFAULT_MULTICAST_PORT : url.getPort();
multicastSocket = new MulticastSocket(multicastPort);
NetUtils.joinMulticastGroup(multicastSocket, multicastAddress);
- Thread thread = new Thread(new Runnable() {
- @Override
- public void run() {
- byte[] buf = new byte[2048];
- DatagramPacket recv = new DatagramPacket(buf, buf.length);
- while (!multicastSocket.isClosed()) {
- try {
- multicastSocket.receive(recv);
- String msg = new String(recv.getData()).trim();
- int i = msg.indexOf('\n');
- if (i > 0) {
- msg = msg.substring(0, i).trim();
- }
- MulticastRegistry.this.receive(msg, (InetSocketAddress) recv.getSocketAddress());
- Arrays.fill(buf, (byte) 0);
- } catch (Throwable e) {
- if (!multicastSocket.isClosed()) {
- logger.error(e.getMessage(), e);
- }
+ Thread thread = new Thread(() -> {
+ byte[] buf = new byte[2048];
+ DatagramPacket recv = new DatagramPacket(buf, buf.length);
+ while (!multicastSocket.isClosed()) {
+ try {
+ multicastSocket.receive(recv);
+ String msg = new String(recv.getData()).trim();
+ int i = msg.indexOf('\n');
+ if (i > 0) {
+ msg = msg.substring(0, i).trim();
+ }
+ MulticastRegistry.this.receive(msg, (InetSocketAddress) recv.getSocketAddress());
+ Arrays.fill(buf, (byte) 0);
+ } catch (Throwable e) {
+ if (!multicastSocket.isClosed()) {
+ logger.error(e.getMessage(), e);
}
}
}
diff --git a/dubbo-registry/dubbo-registry-multiple/src/main/java/org/apache/dubbo/registry/multiple/MultipleRegistry.java b/dubbo-registry/dubbo-registry-multiple/src/main/java/org/apache/dubbo/registry/multiple/MultipleRegistry.java
index 0e83e7034f..0b1e5d923e 100644
--- a/dubbo-registry/dubbo-registry-multiple/src/main/java/org/apache/dubbo/registry/multiple/MultipleRegistry.java
+++ b/dubbo-registry/dubbo-registry-multiple/src/main/java/org/apache/dubbo/registry/multiple/MultipleRegistry.java
@@ -251,7 +251,7 @@ public class MultipleRegistry extends AbstractRegistry {
return effectReferenceRegistryURLs;
}
- static protected class MultipleNotifyListenerWrapper implements NotifyListener {
+ protected static class MultipleNotifyListenerWrapper implements NotifyListener {
Map<URL, SingleNotifyListener> registryMap = new ConcurrentHashMap<URL, SingleNotifyListener>(4);
NotifyListener sourceNotifyListener;
@@ -311,7 +311,7 @@ public class MultipleRegistry extends AbstractRegistry {
}
}
- static protected class SingleNotifyListener implements NotifyListener {
+ protected static class SingleNotifyListener implements NotifyListener {
MultipleNotifyListenerWrapper multipleNotifyListenerWrapper;
Registry registry;
diff --git a/dubbo-registry/dubbo-registry-nacos/src/test/java/org/apache/dubbo/registry/nacos/NacosRegistryTest.java b/dubbo-registry/dubbo-registry-nacos/src/test/java/org/apache/dubbo/registry/nacos/NacosRegistryTest.java
index 48a9c289da..9e61a84f2b 100644
--- a/dubbo-registry/dubbo-registry-nacos/src/test/java/org/apache/dubbo/registry/nacos/NacosRegistryTest.java
+++ b/dubbo-registry/dubbo-registry-nacos/src/test/java/org/apache/dubbo/registry/nacos/NacosRegistryTest.java
@@ -114,7 +114,7 @@ public class NacosRegistryTest {
}
registered = nacosRegistry.getRegistered();
- Assertions.assertEquals(registered.size(), 1);
+ Assertions.assertEquals(1, registered.size());
}
@Test
@@ -150,11 +150,11 @@ public class NacosRegistryTest {
Set<URL> registered = nacosRegistry.getRegistered();
assertThat(registered.contains(serviceUrl), is(true));
- Assertions.assertEquals(registered.size(), 1);
+ Assertions.assertEquals(1, registered.size());
nacosRegistry.unregister(serviceUrl);
Assertions.assertFalse(registered.contains(serviceUrl));
- Assertions.assertEquals(registered.size(), 0);
+ Assertions.assertEquals(0, registered.size());
}
@Test
@@ -190,8 +190,8 @@ public class NacosRegistryTest {
nacosRegistry.subscribe(serviceUrl, listener);
Map<URL, Set<NotifyListener>> subscribed = nacosRegistry.getSubscribed();
- Assertions.assertEquals(subscribed.size(), 1);
- Assertions.assertEquals(subscribed.get(serviceUrl).size(), 1);
+ Assertions.assertEquals(1, subscribed.size());
+ Assertions.assertEquals(1, subscribed.get(serviceUrl).size());
}
@Test
@@ -229,13 +229,13 @@ public class NacosRegistryTest {
nacosRegistry.subscribe(serviceUrl, listener);
Map<URL, Set<NotifyListener>> subscribed = nacosRegistry.getSubscribed();
- Assertions.assertEquals(subscribed.size(), 1);
- Assertions.assertEquals(subscribed.get(serviceUrl).size(), 1);
+ Assertions.assertEquals(1, subscribed.size());
+ Assertions.assertEquals(1, subscribed.get(serviceUrl).size());
nacosRegistry.unsubscribe(serviceUrl, listener);
subscribed = nacosRegistry.getSubscribed();
- Assertions.assertEquals(subscribed.size(), 1);
- Assertions.assertEquals(subscribed.get(serviceUrl).size(), 0);
+ Assertions.assertEquals(1, subscribed.size());
+ Assertions.assertEquals(0, subscribed.get(serviceUrl).size());
}
@@ -285,7 +285,7 @@ public class NacosRegistryTest {
registered = nacosRegistry.getRegistered();
Assertions.assertTrue(registered.contains(serviceUrl));
Assertions.assertTrue(registered.contains(serviceUrlWithoutCategory));
- Assertions.assertEquals(registered.size(), 2);
+ Assertions.assertEquals(2, registered.size());
URL serviceUrlWithWildcard = URL.valueOf("nacos://127.0.0.1:3333/" +
serviceInterface +
@@ -303,10 +303,10 @@ public class NacosRegistryTest {
Map<URL, Set<NotifyListener>> subscribed = nacosRegistry.getSubscribed();
- Assertions.assertEquals(registered.size(), 2);
- Assertions.assertEquals(subscribed.get(serviceUrlWithOutWildcard).size(), 1);
+ Assertions.assertEquals(2, registered.size());
+ Assertions.assertEquals(1, subscribed.get(serviceUrlWithOutWildcard).size());
- Assertions.assertEquals(registered.size(), 2);
- Assertions.assertEquals(subscribed.get(serviceUrlWithWildcard).size(), 1);
+ Assertions.assertEquals(2, registered.size());
+ Assertions.assertEquals(1, subscribed.get(serviceUrlWithWildcard).size());
}
}
diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java
index f3b8f72bf1..a4610ba19c 100644
--- a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java
+++ b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java
@@ -57,9 +57,9 @@ import static org.apache.dubbo.common.constants.RegistryConstants.ROUTERS_CATEGO
*/
public class ZookeeperRegistry extends CacheableFailbackRegistry {
- private final static Logger logger = LoggerFactory.getLogger(ZookeeperRegistry.class);
+ private static final Logger logger = LoggerFactory.getLogger(ZookeeperRegistry.class);
- private final static String DEFAULT_ROOT = "dubbo";
+ private static final String DEFAULT_ROOT = "dubbo";
private final String root;