You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by so...@apache.org on 2019/04/17 04:38:28 UTC
[incubator-dubbo] branch master updated: make protocols a mutable
list (a concrete ArrayList) (#3869)
This is an automated email from the ASF dual-hosted git repository.
songkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 43f2a2a make protocols a mutable list (a concrete ArrayList) (#3869)
43f2a2a is described below
commit 43f2a2a58662c4480c7bd8ade9ef59d043b43496
Author: myPrecious <Mo...@users.noreply.github.com>
AuthorDate: Wed Apr 17 12:38:04 2019 +0800
make protocols a mutable list (a concrete ArrayList) (#3869)
* use ArrayList instead of Arrays.ArrayList
---
.../src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java | 3 ++-
.../src/main/java/org/apache/dubbo/config/ProviderConfig.java | 3 ++-
.../src/main/java/org/apache/dubbo/config/ServiceConfig.java | 2 +-
.../test/java/org/apache/dubbo/config/AbstractServiceConfigTest.java | 3 ++-
.../src/test/java/org/apache/dubbo/config/url/UrlTestBase.java | 5 +++--
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
index 24ac6a2..5fa02eb 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
@@ -22,6 +22,7 @@ import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.config.support.Parameter;
import org.apache.dubbo.rpc.ExporterListener;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -210,7 +211,7 @@ public abstract class AbstractServiceConfig extends AbstractInterfaceConfig {
}
public void setProtocol(ProtocolConfig protocol) {
- setProtocols(Arrays.asList(protocol));
+ setProtocols(new ArrayList<>(Arrays.asList(protocol)));
}
@Parameter(excluded = true)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProviderConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProviderConfig.java
index bc5c31d..58e9748 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProviderConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProviderConfig.java
@@ -25,6 +25,7 @@ import org.apache.dubbo.remoting.Transporter;
import org.apache.dubbo.remoting.exchange.Exchanger;
import org.apache.dubbo.remoting.telnet.TelnetHandler;
+import java.util.ArrayList;
import java.util.Arrays;
/**
@@ -157,7 +158,7 @@ public class ProviderConfig extends AbstractServiceConfig {
@Deprecated
public void setProtocol(String protocol) {
- this.protocols = Arrays.asList(new ProtocolConfig[]{new ProtocolConfig(protocol)});
+ this.protocols = new ArrayList<>(Arrays.asList(new ProtocolConfig(protocol)));
}
@Parameter(excluded = true)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
index dce2c94..1f14dd2 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -830,7 +830,7 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
.orElseGet(() -> {
ProtocolConfig protocolConfig = new ProtocolConfig();
protocolConfig.refresh();
- return Arrays.asList(protocolConfig);
+ return new ArrayList<>(Arrays.asList(protocolConfig));
})
);
}
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractServiceConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractServiceConfigTest.java
index f015975..00ff874 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractServiceConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractServiceConfigTest.java
@@ -21,6 +21,7 @@ import org.apache.dubbo.common.Constants;
import org.junit.jupiter.api.Test;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -110,7 +111,7 @@ public class AbstractServiceConfigTest {
assertThat(serviceConfig.getProtocol(), nullValue());
serviceConfig.setProtocol(new ProtocolConfig());
assertThat(serviceConfig.getProtocol(), notNullValue());
- serviceConfig.setProtocols(Collections.singletonList(new ProtocolConfig()));
+ serviceConfig.setProtocols(new ArrayList<>(Collections.singletonList(new ProtocolConfig())));
assertThat(serviceConfig.getProtocols(), hasSize(1));
}
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/UrlTestBase.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/UrlTestBase.java
index f5a1a73..a752842 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/UrlTestBase.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/UrlTestBase.java
@@ -28,6 +28,7 @@ import org.apache.dubbo.config.ServiceConfig;
import org.apache.dubbo.config.api.DemoService;
import org.apache.dubbo.config.provider.impl.DemoServiceImpl;
+import java.util.ArrayList;
import java.util.Arrays;
import static org.junit.jupiter.api.Assertions.fail;
@@ -154,8 +155,8 @@ public class UrlTestBase {
provConf.setRegistry(regConfForProvider);
servConf.setRegistry(regConfForService);
- provConf.setProtocols(Arrays.asList(new ProtocolConfig[]{protoConfForProvider}));
- servConf.setProtocols(Arrays.asList(new ProtocolConfig[]{protoConfForService}));
+ provConf.setProtocols(new ArrayList<>(Arrays.asList(protoConfForProvider)));
+ servConf.setProtocols(new ArrayList<>(Arrays.asList(protoConfForService)));
servConf.setMethods(Arrays.asList(new MethodConfig[]{methodConfForService}));
servConf.setProvider(provConf);