You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2021/11/25 06:19:48 UTC
[dubbo] 02/45: 同步变更
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch release/3.0.14-rpccontext-bugfix
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 1e7072885061be76e86af47817fbc7a40189e888
Author: 未宇 <li...@alibaba-inc.com>
AuthorDate: Mon Jul 13 16:47:37 2020 +0800
同步变更
---
.../org/apache/dubbo/rpc/cluster/Configurator.java | 3 +-
.../router/condition/config/ListenableRouter.java | 2 +-
.../dubbo/rpc/cluster/router/tag/TagRouter.java | 12 +++++++
.../dubbo/rpc/cluster/support/ClusterUtils.java | 23 +++++++++++--
.../cluster/support/FailfastClusterInvoker.java | 2 +-
.../support/registry/ZoneAwareClusterInvoker.java | 4 +--
.../support/wrapper/MockClusterWrapper.java | 1 -
.../support/AbstractClusterInvokerTest.java | 2 +-
.../dubbo/common/constants/CommonConstants.java | 7 ++--
.../extension/support/ActivateComparator.java | 4 +--
.../org/apache/dubbo/common/utils/NetUtils.java | 3 +-
.../org/apache/dubbo/common/utils/PojoUtils.java | 36 +++++++++++++++++++-
.../apache/dubbo/config/MetadataReportConfig.java | 4 +--
.../org/apache/dubbo/rpc/model/ConsumerModel.java | 7 +++-
.../apache/dubbo/common/utils/PojoUtilsTest.java | 36 ++++++++++++++++++++
.../dubbo/common/extension/ExtensionFactory.java | 3 ++
.../org/apache/dubbo/config/ReferenceConfig.java | 33 ++++++++++--------
.../org/apache/dubbo/config/ServiceConfig.java | 4 +++
.../dubbo/config/utils/ConfigValidationUtils.java | 1 -
.../org/apache/dubbo/config/ServiceConfigTest.java | 30 ++++++++---------
.../bootstrap/builders/ServiceBuilderTest.java | 32 +++++++++---------
.../annotation/ServiceClassPostProcessor.java | 4 +--
.../spring/schema/DubboNamespaceHandler.java | 25 ++++----------
.../consul/ConsulDynamicConfiguration.java | 2 +-
.../consul/ConsulDynamicConfigurationTest.java | 6 ++++
dubbo-dependencies-bom/pom.xml | 4 +--
.../dubbo-dependencies-zookeeper/pom.xml | 2 +-
.../validation/support/jvalidation/JValidator.java | 6 ++--
.../metadata/definition/TypeDefinitionBuilder.java | 10 +++---
.../metadata/definition/builder/TypeBuilder.java | 3 +-
.../dubbo/metadata/report/MetadataReport.java | 8 ++---
.../store/InMemoryWritableMetadataService.java | 4 +--
.../store/RemoteWritableMetadataService.java | 4 +--
.../dubbo/qos/legacy/InvokerTelnetHandlerTest.java | 14 ++++++++
.../dubbo/qos/legacy/service/DemoService.java | 2 ++
.../dubbo/qos/legacy/service/DemoServiceImpl.java | 5 +++
.../registry/integration/RegistryDirectory.java | 2 +-
.../dubbo/registry/consul/ConsulRegistry.java | 32 ++++++++++++++----
.../registry/dubbo/RegistryDirectoryTest.java | 2 +-
.../dubbo/registry/dubbo/RegistryProtocolTest.java | 5 ++-
.../nacos/util/NacosNamingServiceUtils.java | 3 +-
.../remoting/transport/netty4/NettyServer.java | 4 +--
.../org/apache/dubbo/rpc/AttachmentsAdapter.java | 2 +-
.../main/java/org/apache/dubbo/rpc/Constants.java | 1 +
.../org/apache/dubbo/rpc/filter/ContextFilter.java | 4 +--
.../apache/dubbo/rpc/filter/GenericImplFilter.java | 3 +-
.../dubbo/rpc/protocol/AsyncToSyncInvoker.java | 23 +++++++++----
.../rpc/protocol/ProtocolListenerWrapper.java | 1 -
.../org/apache/dubbo/rpc/support/RpcUtils.java | 34 +++++++++++++++----
.../dubbo/internal/org.apache.dubbo.rpc.Filter | 3 +-
.../java/org/apache/dubbo/rpc/RpcContextTest.java | 1 +
.../rpc/protocol/dubbo/CallbackServiceCodec.java | 3 ++
.../protocol/dubbo/DecodeableRpcInvocation.java | 2 +-
.../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 8 +++--
.../rpc/protocol/dubbo/ArgumentCallbackTest.java | 39 +++++++++++++++++-----
.../dubbo/rpc/protocol/thrift/ThriftInvoker.java | 1 +
pom.xml | 15 ++++++++-
57 files changed, 377 insertions(+), 159 deletions(-)
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java
index fd62628..ddd114e 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java
@@ -86,8 +86,7 @@ public interface Configurator extends Comparable<Configurator> {
Map<String, String> override = new HashMap<>(url.getParameters());
//The anyhost parameter of override may be added automatically, it can't change the judgement of changing url
override.remove(ANYHOST_KEY);
- if (override.size() == 0) {
- configurators.clear();
+ if (CollectionUtils.isEmptyMap(override)) {
continue;
}
configurators.add(configuratorFactory.getConfigurator(url));
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableRouter.java
index 74dfce2..a3514c1 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableRouter.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableRouter.java
@@ -92,7 +92,7 @@ public abstract class ListenableRouter extends AbstractRouter implements Configu
@Override
public int getPriority() {
- return DEFAULT_PRIORITY;
+ return priority;
}
@Override
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java
index eb11120..77429b5 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java
@@ -193,6 +193,18 @@ public class TagRouter extends AbstractRouter implements ConfigurationListener {
}
private <T> List<Invoker<T>> filterInvoker(List<Invoker<T>> invokers, Predicate<Invoker<T>> predicate) {
+ boolean filter = false;
+ for (int i = 0; i < invokers.size(); ++i) {
+ Invoker<T> invoker = invokers.get(i);
+ if (!predicate.test(invoker)) {
+ filter = true;
+ break;
+ }
+ }
+ if (!filter) {
+ return invokers;
+ }
+
return invokers.stream()
.filter(predicate)
.collect(Collectors.toList());
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java
index 1d0c849..05e9e43 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java
@@ -17,9 +17,11 @@
package org.apache.dubbo.rpc.cluster.support;
import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.remoting.Constants;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import static org.apache.dubbo.common.constants.CommonConstants.ALIVE_KEY;
@@ -82,10 +84,10 @@ public class ClusterUtils {
if (localMap != null && localMap.size() > 0) {
Map<String, String> copyOfLocalMap = new HashMap<>(localMap);
- if(map.containsKey(GROUP_KEY)){
+ if (map.containsKey(GROUP_KEY)) {
copyOfLocalMap.remove(GROUP_KEY);
}
- if(map.containsKey(VERSION_KEY)){
+ if (map.containsKey(VERSION_KEY)) {
copyOfLocalMap.remove(VERSION_KEY);
}
@@ -117,4 +119,21 @@ public class ClusterUtils {
return remoteUrl.clearParameters().addParameters(map);
}
+ public static URL mergeProviderUrl(URL remoteUrl, Map<String, String> localMap) {
+
+ //urlprocessor => upc
+ List<ProviderURLMergeProcessor> providerURLMergeProcessors = ExtensionLoader.getExtensionLoader(ProviderURLMergeProcessor.class)
+ .getActivateExtension(remoteUrl, "upc");
+
+ if (providerURLMergeProcessors != null && providerURLMergeProcessors.size() > 0) {
+ for (ProviderURLMergeProcessor providerURLMergeProcessor : providerURLMergeProcessors) {
+ if (providerURLMergeProcessor.accept(remoteUrl, localMap)) {
+ return providerURLMergeProcessor.mergeProviderUrl(remoteUrl, localMap);
+ }
+ }
+ }
+
+ return mergeUrl(remoteUrl, localMap);
+ }
+
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvoker.java
index 082c1eb..7812741 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvoker.java
@@ -52,7 +52,7 @@ public class FailfastClusterInvoker<T> extends AbstractClusterInvoker<T> {
}
throw new RpcException(e instanceof RpcException ? ((RpcException) e).getCode() : 0,
"Failfast invoke providers " + invoker.getUrl() + " " + loadbalance.getClass().getSimpleName()
- + " select from all providers " + invokers + " for service " + getInterface().getName()
+ + " for service " + getInterface().getName()
+ " method " + invocation.getMethodName() + " on consumer " + NetUtils.getLocalHost()
+ " use dubbo version " + Version.getVersion()
+ ", but no luck to perform the invocation. Last error is: " + e.getMessage(),
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/registry/ZoneAwareClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/registry/ZoneAwareClusterInvoker.java
index dce706e..f5043e3 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/registry/ZoneAwareClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/registry/ZoneAwareClusterInvoker.java
@@ -40,7 +40,7 @@ import static org.apache.dubbo.common.constants.RegistryConstants.ZONE_KEY;
/**
* When there're more than one registry for subscription.
- *
+ * <p>
* This extension provides a strategy to decide how to distribute traffics among them:
* 1. registry marked as 'preferred=true' has the highest priority.
* 2. check the zone the current request belongs, pick the registry that has the same zone first.
@@ -103,4 +103,4 @@ public class ZoneAwareClusterInvoker<T> extends AbstractClusterInvoker<T> {
return invokers.get(0).invoke(invocation);
}
-}
+}
\ No newline at end of file
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterWrapper.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterWrapper.java
index 2e67885..8aa2306 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterWrapper.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterWrapper.java
@@ -25,7 +25,6 @@ import org.apache.dubbo.rpc.cluster.Directory;
* mock impl
*
*/
-//@Wrapper(mismatches = {ZoneAwareCluster.NAME})
public class MockClusterWrapper implements Cluster {
private Cluster cluster;
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java
index a27a70e..a6ec35b 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java
@@ -227,7 +227,7 @@ public class AbstractClusterInvokerTest {
public void testCloseAvailablecheck() {
LoadBalance lb = mock(LoadBalance.class);
Map<String, String> queryMap = StringUtils.parseQueryString(url.getParameterAndDecoded(REFER_KEY));
- URL tmpUrl = url.addParameters(queryMap).removeParameter(MONITOR_KEY);
+ URL tmpUrl = url.addParameters(queryMap).removeParameter(REFER_KEY).removeParameter(MONITOR_KEY);
given(lb.select(invokers, tmpUrl, invocation)).willReturn(invoker1);
initlistsize5();
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
index cac52fe..eca3495 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
@@ -112,7 +112,7 @@ public interface CommonConstants {
// used by invocation attachments to transfer timeout from Consumer to Provider.
// works as a replacement of TIMEOUT_KEY on wire, which seems to be totally useless in previous releases).
- String TIMEOUT_ATTACHENT_KEY = "_TO";
+ String TIMEOUT_ATTACHMENT_KEY = "_TO";
String TIME_COUNTDOWN_KEY = "timeout-countdown";
@@ -120,13 +120,13 @@ public interface CommonConstants {
String REMOVE_VALUE_PREFIX = "-";
- String PROPERTIES_CHAR_SEPERATOR = "-";
+ String PROPERTIES_CHAR_SEPARATOR = "-";
String UNDERLINE_SEPARATOR = "_";
String SEPARATOR_REGEX = "_|-";
- String GROUP_CHAR_SEPERATOR = ":";
+ String GROUP_CHAR_SEPARATOR = ":";
String HIDE_KEY_PREFIX = ".";
@@ -197,6 +197,7 @@ public interface CommonConstants {
*/
String $INVOKE = "$invoke";
String $INVOKE_ASYNC = "$invokeAsync";
+ String GENERIC_PARAMETER_DESC = "Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/Object;";
/**
* package version in the manifest
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java
index 0f884dd..8b2a4c1 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java
@@ -75,10 +75,8 @@ public class ActivateComparator implements Comparator<Object> {
}
}
}
- int n1 = a1 == null ? 0 : a1.order;
- int n2 = a2 == null ? 0 : a2.order;
// never return 0 even if n1 equals n2, otherwise, o1 and o2 will override each other in collection like HashSet
- return n1 > n2 ? 1 : -1;
+ return a1.order > a2.order ? 1 : -1;
}
private Class<?> findSpi(Class clazz) {
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/NetUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/NetUtils.java
index eb5be28..e11b003 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/NetUtils.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/NetUtils.java
@@ -373,7 +373,6 @@ public class NetUtils {
}
}
-
if (result == null) { // If not found, try to get the first one
for (NetworkInterface networkInterface : validNetworkInterfaces) {
Enumeration<InetAddress> addresses = networkInterface.getInetAddresses();
@@ -559,7 +558,7 @@ public class NetUtils {
if (!ipPatternContainExpression(pattern)) {
InetAddress patternAddress = InetAddress.getByName(pattern);
return patternAddress.getHostAddress().equals(host);
- }
+ }
String[] ipAddress = host.split(splitCharacter);
for (int i = 0; i < mask.length; i++) {
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/PojoUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/PojoUtils.java
index b0f582c..559604f 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/PojoUtils.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/PojoUtils.java
@@ -417,7 +417,19 @@ public class PojoUtils {
}
if (Map.class.isAssignableFrom(type) || type == Object.class) {
- final Map<Object, Object> result = createMap(map);
+ final Map<Object, Object> result;
+ // fix issue#5939
+ Type mapKeyType = getKeyTypeForMap(map.getClass());
+ Type typeKeyType = getGenericClassByIndex(genericType, 0);
+ boolean typeMismatch = mapKeyType instanceof Class
+ && typeKeyType instanceof Class
+ && !typeKeyType.getTypeName().equals(mapKeyType.getTypeName());
+ if (typeMismatch) {
+ result = createMap(new HashMap(0));
+ } else {
+ result = createMap(map);
+ }
+
history.put(pojo, result);
for (Map.Entry<Object, Object> entry : map.entrySet()) {
Type keyType = getGenericClassByIndex(genericType, 0);
@@ -504,6 +516,28 @@ public class PojoUtils {
}
/**
+ * Get key type for {@link Map} directly implemented by {@code clazz}.
+ * If {@code clazz} does not implement {@link Map} directly, return {@code null}.
+ *
+ * @param clazz {@link Class}
+ * @return Return String.class for {@link com.alibaba.fastjson.JSONObject}
+ */
+ private static Type getKeyTypeForMap(Class<?> clazz) {
+ Type[] interfaces = clazz.getGenericInterfaces();
+ if (!ArrayUtils.isEmpty(interfaces)) {
+ for (Type type : interfaces) {
+ if (type instanceof ParameterizedType) {
+ ParameterizedType t = (ParameterizedType)type;
+ if ("java.util.Map".equals(t.getRawType().getTypeName())) {
+ return t.getActualTypeArguments()[0];
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
* Get parameterized type
*
* @param genericType generic type
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java
index 0abda27..175288c 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.Map;
import static org.apache.dubbo.common.constants.CommonConstants.DUBBO;
-import static org.apache.dubbo.common.constants.CommonConstants.PROPERTIES_CHAR_SEPERATOR;
+import static org.apache.dubbo.common.constants.CommonConstants.PROPERTIES_CHAR_SEPARATOR;
/**
* MetadataReportConfig
@@ -38,7 +38,7 @@ public class MetadataReportConfig extends AbstractConfig {
* the value is : metadata-report
*/
private static final String PREFIX_TAG = StringUtils.camelToSplitName(
- MetadataReportConfig.class.getSimpleName().substring(0, MetadataReportConfig.class.getSimpleName().length() - 6), PROPERTIES_CHAR_SEPERATOR);
+ MetadataReportConfig.class.getSimpleName().substring(0, MetadataReportConfig.class.getSimpleName().length() - 6), PROPERTIES_CHAR_SEPARATOR);
// Register center address
private String address;
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java
index 9dca2e8..e49888d 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java
@@ -138,7 +138,12 @@ public class ConsumerModel {
}
public void initMethodModels() {
- Class[] interfaceList = serviceMetadata.getTarget().getClass().getInterfaces();
+ Class[] interfaceList = null;
+ if (proxyObject == null) {
+ interfaceList = new Class[]{referenceConfig.getActualInterface()};
+ } else {
+ interfaceList = proxyObject.getClass().getInterfaces();
+ }
for (Class interfaceClass : interfaceList) {
for (Method method : interfaceClass.getMethods()) {
methodModels.put(method, new ConsumerMethodModel(method));
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
index e05c09d..0144059 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.dubbo.common.utils;
+import com.alibaba.fastjson.JSONObject;
import org.apache.dubbo.common.model.Person;
import org.apache.dubbo.common.model.SerializablePerson;
import org.apache.dubbo.common.model.User;
@@ -280,6 +281,41 @@ public class PojoUtilsTest {
}
@Test
+ public void testJsonObjectToMap() throws Exception {
+ Method method = PojoUtilsTest.class.getMethod("setMap", Map.class);
+ assertNotNull(method);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("1", "test");
+ @SuppressWarnings("unchecked")
+ Map<Integer, Object> value = (Map<Integer, Object>)PojoUtils.realize(jsonObject,
+ method.getParameterTypes()[0],
+ method.getGenericParameterTypes()[0]);
+ method.invoke(new PojoUtilsTest(), value);
+ assertEquals("test", value.get(1));
+ }
+
+ @Test
+ public void testListJsonObjectToListMap() throws Exception {
+ Method method = PojoUtilsTest.class.getMethod("setListMap", List.class);
+ assertNotNull(method);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("1", "test");
+ List<JSONObject> list = new ArrayList<>(1);
+ list.add(jsonObject);
+ @SuppressWarnings("unchecked")
+ List<Map<Integer, Object>> result = (List<Map<Integer, Object>>)PojoUtils.realize(
+ list,
+ method.getParameterTypes()[0],
+ method.getGenericParameterTypes()[0]);
+ method.invoke(new PojoUtilsTest(), result);
+ assertEquals("test", result.get(0).get(1));
+ }
+
+ public void setMap(Map<Integer, Object> map) {}
+
+ public void setListMap(List<Map<Integer, Object>> list) {}
+
+ @Test
public void testException() throws Exception {
Map map = new HashMap();
map.put("message", "dubbo exception");
diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/extension/ExtensionFactory.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/extension/ExtensionFactory.java
index 9c8599b..bc0f0b2 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/extension/ExtensionFactory.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/extension/ExtensionFactory.java
@@ -16,7 +16,10 @@
*/
package com.alibaba.dubbo.common.extension;
+import org.apache.dubbo.common.extension.SPI;
+
@Deprecated
+@SPI
public interface ExtensionFactory extends org.apache.dubbo.common.extension.ExtensionFactory {
}
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
index df9eed2..d05859a 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
@@ -265,6 +265,8 @@ public class ReferenceConfig<T> extends ReferenceConfigBase<T> {
initialized = true;
+ checkInvokerAvailable();
+
// dispatch a ReferenceConfigInitializedEvent since 2.7.4
dispatch(new ReferenceConfigInitializedEvent(this, invoker));
}
@@ -339,19 +341,6 @@ public class ReferenceConfig<T> extends ReferenceConfigBase<T> {
}
}
- if (shouldCheck() && !invoker.isAvailable()) {
- invoker.destroy();
- throw new IllegalStateException("Failed to check the status of the service "
- + interfaceName
- + ". No provider available for the service "
- + (group == null ? "" : group + "/")
- + interfaceName +
- (version == null ? "" : ":" + version)
- + " from the url "
- + invoker.getUrl()
- + " to the consumer "
- + NetUtils.getLocalHost() + " use dubbo version " + Version.getVersion());
- }
if (logger.isInfoEnabled()) {
logger.info("Refer dubbo service " + interfaceClass.getName() + " from url " + invoker.getUrl());
}
@@ -369,6 +358,22 @@ public class ReferenceConfig<T> extends ReferenceConfigBase<T> {
return (T) PROXY_FACTORY.getProxy(invoker, ProtocolUtils.isGeneric(generic));
}
+ private void checkInvokerAvailable() throws IllegalStateException {
+ if (shouldCheck() && !invoker.isAvailable()) {
+ invoker.destroy();
+ throw new IllegalStateException("Failed to check the status of the service "
+ + interfaceName
+ + ". No provider available for the service "
+ + (group == null ? "" : group + "/")
+ + interfaceName +
+ (version == null ? "" : ":" + version)
+ + " from the url "
+ + invoker.getUrl()
+ + " to the consumer "
+ + NetUtils.getLocalHost() + " use dubbo version " + Version.getVersion());
+ }
+ }
+
/**
* This method should be called right after the creation of this class's instance, before any property in other config modules is used.
* Check each config modules are created properly and override their properties if necessary.
@@ -469,7 +474,7 @@ public class ReferenceConfig<T> extends ReferenceConfigBase<T> {
}
private void postProcessConfig() {
- List<ConfigPostProcessor> configPostProcessors =ExtensionLoader.getExtensionLoader(ConfigPostProcessor.class)
+ List<ConfigPostProcessor> configPostProcessors = ExtensionLoader.getExtensionLoader(ConfigPostProcessor.class)
.getActivateExtension(URL.valueOf("configPostProcessor://"), (String[]) null);
configPostProcessors.forEach(component -> component.postProcessReferConfig(this));
}
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 3ad4545..bd7e472 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
@@ -200,6 +200,10 @@ public class ServiceConfig<T> extends ServiceConfigBase<T> {
serviceMetadata.setServiceInterfaceName(getInterface());
serviceMetadata.setTarget(getRef());
+ if (!shouldExport()) {
+ return;
+ }
+
if (shouldDelay()) {
DELAY_EXPORT_EXECUTOR.schedule(this::doExport, getDelay(), TimeUnit.MILLISECONDS);
} else {
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java
index 4f3e5de..2e46fa2 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java
@@ -97,7 +97,6 @@ import static org.apache.dubbo.config.Constants.CONTEXTPATH_KEY;
import static org.apache.dubbo.config.Constants.DUBBO_IP_TO_REGISTRY;
import static org.apache.dubbo.config.Constants.ENVIRONMENT;
import static org.apache.dubbo.config.Constants.LAYER_KEY;
-import static org.apache.dubbo.config.Constants.LISTENER_KEY;
import static org.apache.dubbo.config.Constants.NAME;
import static org.apache.dubbo.config.Constants.ORGANIZATION;
import static org.apache.dubbo.config.Constants.OWNER;
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
index c1f42e2..4d157ff 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
@@ -239,21 +239,21 @@ public class ServiceConfigTest {
});
}
- @Test
- public void testMock() throws Exception {
- Assertions.assertThrows(IllegalArgumentException.class, () -> {
- ServiceConfig service = new ServiceConfig();
- service.setMock("true");
- });
- }
-
- @Test
- public void testMock2() throws Exception {
- Assertions.assertThrows(IllegalArgumentException.class, () -> {
- ServiceConfig service = new ServiceConfig();
- service.setMock(true);
- });
- }
+// @Test
+// public void testMock() throws Exception {
+// Assertions.assertThrows(IllegalArgumentException.class, () -> {
+// ServiceConfig service = new ServiceConfig();
+// service.setMock("true");
+// });
+// }
+//
+// @Test
+// public void testMock2() throws Exception {
+// Assertions.assertThrows(IllegalArgumentException.class, () -> {
+// ServiceConfig service = new ServiceConfig();
+// service.setMock(true);
+// });
+// }
@Test
public void testApplicationInUrl() {
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/builders/ServiceBuilderTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/builders/ServiceBuilderTest.java
index 5b07c29..ae07c24 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/builders/ServiceBuilderTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/builders/ServiceBuilderTest.java
@@ -91,22 +91,22 @@ class ServiceBuilderTest {
builder.generic("illegal").build();
});
}
-
- @Test
- public void Mock() throws Exception {
- Assertions.assertThrows(IllegalArgumentException.class, () -> {
- ServiceBuilder builder = new ServiceBuilder();
- builder.mock("true");
- });
- }
-
- @Test
- public void Mock1() throws Exception {
- Assertions.assertThrows(IllegalArgumentException.class, () -> {
- ServiceBuilder builder = new ServiceBuilder();
- builder.mock(true);
- });
- }
+//
+// @Test
+// public void Mock() throws Exception {
+// Assertions.assertThrows(IllegalArgumentException.class, () -> {
+// ServiceBuilder builder = new ServiceBuilder();
+// builder.mock("true");
+// });
+// }
+//
+// @Test
+// public void Mock1() throws Exception {
+// Assertions.assertThrows(IllegalArgumentException.class, () -> {
+// ServiceBuilder builder = new ServiceBuilder();
+// builder.mock(true);
+// });
+// }
@Test
void build() {
diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceClassPostProcessor.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceClassPostProcessor.java
index ed73be4..b1c9a30 100644
--- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceClassPostProcessor.java
+++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceClassPostProcessor.java
@@ -68,7 +68,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import static com.alibaba.spring.util.AnnotatedBeanDefinitionRegistryUtils.registerBeans;
+import static com.alibaba.spring.util.BeanRegistrar.registerInfrastructureBean;
import static com.alibaba.spring.util.ObjectUtils.of;
import static java.util.Arrays.asList;
import static org.apache.dubbo.config.spring.beans.factory.annotation.ServiceBeanNameBuilder.create;
@@ -126,7 +126,7 @@ public class ServiceClassPostProcessor implements BeanDefinitionRegistryPostProc
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
// @since 2.7.5
- registerBeans(registry, DubboBootstrapApplicationListener.class);
+ registerInfrastructureBean(registry, DubboBootstrapApplicationListener.BEAN_NAME, DubboBootstrapApplicationListener.class);
Set<String> resolvedPackagesToScan = resolvePackagesToScan(packagesToScan);
diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandler.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandler.java
index 924d70a..a747e00 100644
--- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandler.java
+++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandler.java
@@ -31,19 +31,15 @@ import org.apache.dubbo.config.spring.ConfigCenterBean;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.ServiceBean;
import org.apache.dubbo.config.spring.beans.factory.config.ConfigurableSourceBeanMetadataElement;
-import org.apache.dubbo.config.spring.context.DubboBootstrapApplicationListener;
-import org.apache.dubbo.config.spring.context.DubboLifecycleComponentApplicationListener;
-import com.alibaba.spring.util.AnnotatedBeanDefinitionRegistryUtils;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.context.ApplicationListener;
import org.springframework.context.annotation.AnnotationConfigUtils;
import org.w3c.dom.Element;
-import static com.alibaba.spring.util.AnnotatedBeanDefinitionRegistryUtils.registerBeans;
+import static org.apache.dubbo.config.spring.util.DubboBeanUtils.registerCommonBeans;
/**
* DubboNamespaceHandler
@@ -86,26 +82,17 @@ public class DubboNamespaceHandler extends NamespaceHandlerSupport implements Co
public BeanDefinition parse(Element element, ParserContext parserContext) {
BeanDefinitionRegistry registry = parserContext.getRegistry();
registerAnnotationConfigProcessors(registry);
- registerApplicationListeners(registry);
+ /**
+ * @since 2.7.8
+ * issue : https://github.com/apache/dubbo/issues/6275
+ */
+ registerCommonBeans(registry);
BeanDefinition beanDefinition = super.parse(element, parserContext);
setSource(beanDefinition);
return beanDefinition;
}
/**
- * Register {@link ApplicationListener ApplicationListeners} as a Spring Bean
- *
- * @param registry {@link BeanDefinitionRegistry}
- * @see ApplicationListener
- * @see AnnotatedBeanDefinitionRegistryUtils#registerBeans(BeanDefinitionRegistry, Class[])
- * @since 2.7.5
- */
- private void registerApplicationListeners(BeanDefinitionRegistry registry) {
- registerBeans(registry, DubboLifecycleComponentApplicationListener.class);
- registerBeans(registry, DubboBootstrapApplicationListener.class);
- }
-
- /**
* Register the processors for the Spring Annotation-Driven features
*
* @param registry {@link BeanDefinitionRegistry}
diff --git a/dubbo-configcenter/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java
index 282bdef..e0e9a86 100644
--- a/dubbo-configcenter/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java
+++ b/dubbo-configcenter/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java
@@ -145,7 +145,7 @@ public class ConsulDynamicConfiguration implements DynamicConfiguration {
// }
// return true;
String normalizedKey = convertKey(group, key);
- return kvClient.putValue(normalizedKey + PATH_SEPARATOR + content);
+ return kvClient.putValue(normalizedKey, content);
}
@Override
diff --git a/dubbo-configcenter/dubbo-configcenter-consul/src/test/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfigurationTest.java b/dubbo-configcenter/dubbo-configcenter-consul/src/test/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfigurationTest.java
index 8ada5fb..d924c83 100644
--- a/dubbo-configcenter/dubbo-configcenter-consul/src/test/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfigurationTest.java
+++ b/dubbo-configcenter/dubbo-configcenter-consul/src/test/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfigurationTest.java
@@ -103,6 +103,12 @@ public class ConsulDynamicConfigurationTest {
}
@Test
+ public void testPublishConfig() {
+ configuration.publishConfig("foo", "value1");
+ Assertions.assertEquals("value1", configuration.getString("/dubbo/config/dubbo/foo"));
+ }
+
+ @Test
public void testGetConfigKeys() {
}
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index c55b61d..1b201d6 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -97,7 +97,7 @@
<grizzly_version>2.1.4</grizzly_version>
<httpclient_version>4.5.3</httpclient_version>
<httpcore_version>4.4.6</httpcore_version>
- <fastjson_version>1.2.68</fastjson_version>
+ <fastjson_version>1.2.70</fastjson_version>
<zookeeper_version>3.4.13</zookeeper_version>
<curator_version>4.0.1</curator_version>
<curator_test_version>2.12.0</curator_test_version>
@@ -163,7 +163,7 @@
<mortbay_jetty_version>6.1.26</mortbay_jetty_version>
<portlet_version>2.0</portlet_version>
<maven_flatten_version>1.1.0</maven_flatten_version>
- <revision>2.7.7-qlj-SNAPSHOT</revision>
+ <revision>2.7.8-qlj-SNAPSHOT</revision>
</properties>
<dependencyManagement>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
index 17253b3..fc2af7f 100644
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@ -32,7 +32,7 @@
<packaging>pom</packaging>
<properties>
- <revision>2.7.7-qlj-SNAPSHOT</revision>
+ <revision>2.7.8-qlj-SNAPSHOT</revision>
<maven_flatten_version>1.1.0</maven_flatten_version>
</properties>
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidator.java b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidator.java
index ea8c6db..aa21ce4 100644
--- a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidator.java
+++ b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidator.java
@@ -186,7 +186,7 @@ public class JValidator implements Validator {
private static String generateMethodParameterClassName(Class<?> clazz, Method method) {
StringBuilder builder = new StringBuilder().append(clazz.getName())
.append("_")
- .append(toUpperMethoName(method.getName()))
+ .append(toUpperMethodName(method.getName()))
.append("Parameter");
Class<?>[] parameterTypes = method.getParameterTypes();
@@ -211,7 +211,7 @@ public class JValidator implements Validator {
return false;
}
- private static String toUpperMethoName(String methodName) {
+ private static String toUpperMethodName(String methodName) {
return methodName.substring(0, 1).toUpperCase() + methodName.substring(1);
}
@@ -292,7 +292,7 @@ public class JValidator implements Validator {
private Class methodClass(String methodName) {
Class<?> methodClass = null;
- String methodClassName = clazz.getName() + "$" + toUpperMethoName(methodName);
+ String methodClassName = clazz.getName() + "$" + toUpperMethodName(methodName);
Class cached = methodClassMap.get(methodClassName);
if (cached != null) {
return cached == clazz ? null : cached;
diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/TypeDefinitionBuilder.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/TypeDefinitionBuilder.java
index d1275e7..fe99d2e 100755
--- a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/TypeDefinitionBuilder.java
+++ b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/TypeDefinitionBuilder.java
@@ -28,6 +28,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import static org.apache.dubbo.common.utils.ClassUtils.isSimpleType;
@@ -36,15 +37,12 @@ import static org.apache.dubbo.common.utils.ClassUtils.isSimpleType;
*/
public class TypeDefinitionBuilder {
private static final Logger logger = LoggerFactory.getLogger(TypeDefinitionBuilder.class);
- private static final List<TypeBuilder> BUILDERS;
+ static final List<TypeBuilder> BUILDERS;
static {
- List<TypeBuilder> builders = new ArrayList<>();
ExtensionLoader<TypeBuilder> extensionLoader = ExtensionLoader.getExtensionLoader(TypeBuilder.class);
- for (String extensionName : extensionLoader.getSupportedExtensions()) {
- builders.add(extensionLoader.getExtension(extensionName));
- }
- BUILDERS = builders;
+ Set<TypeBuilder> tbs = extensionLoader.getSupportedExtensionInstances();
+ BUILDERS = new ArrayList<>(tbs);
}
public static TypeDefinition build(Type type, Class<?> clazz, Map<Class<?>, TypeDefinition> typeCache) {
diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/builder/TypeBuilder.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/builder/TypeBuilder.java
index d7022bd..57673fe 100755
--- a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/builder/TypeBuilder.java
+++ b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/builder/TypeBuilder.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.metadata.definition.builder;
import org.apache.dubbo.common.extension.SPI;
+import org.apache.dubbo.common.lang.Prioritized;
import org.apache.dubbo.metadata.definition.model.TypeDefinition;
import java.lang.reflect.Type;
@@ -26,7 +27,7 @@ import java.util.Map;
* 2015/1/27.
*/
@SPI
-public interface TypeBuilder {
+public interface TypeBuilder extends Prioritized {
/**
* Whether the build accept the type or class passed in.
diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReport.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReport.java
index 90ca45a..e5fc587 100644
--- a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReport.java
+++ b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReport.java
@@ -17,16 +17,16 @@
package org.apache.dubbo.metadata.report;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.dubbo.common.URL;
import org.apache.dubbo.metadata.definition.model.ServiceDefinition;
import org.apache.dubbo.metadata.report.identifier.MetadataIdentifier;
import org.apache.dubbo.metadata.report.identifier.ServiceMetadataIdentifier;
import org.apache.dubbo.metadata.report.identifier.SubscriberMetadataIdentifier;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/**
*
*/
diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/store/InMemoryWritableMetadataService.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/store/InMemoryWritableMetadataService.java
index 8d62ae1..ee1e4d1 100644
--- a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/store/InMemoryWritableMetadataService.java
+++ b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/store/InMemoryWritableMetadataService.java
@@ -144,9 +144,9 @@ public class InMemoryWritableMetadataService implements WritableMetadataService
return;
}
logger.error("publishProvider interfaceName is empty . providerUrl: " + providerUrl.toFullString());
- } catch (ClassNotFoundException e) {
+ } catch (Throwable t) {
//ignore error
- logger.error("publishProvider getServiceDescriptor error. providerUrl: " + providerUrl.toFullString(), e);
+ logger.error("publishProvider getServiceDescriptor error. providerUrl: " + providerUrl.toFullString(), t.getCause());
}
}
diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/store/RemoteWritableMetadataService.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/store/RemoteWritableMetadataService.java
index 9891478..0a2dd76 100644
--- a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/store/RemoteWritableMetadataService.java
+++ b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/store/RemoteWritableMetadataService.java
@@ -100,9 +100,9 @@ public class RemoteWritableMetadataService implements WritableMetadataService {
return;
}
logger.error("publishProvider interfaceName is empty . providerUrl: " + providerUrl.toFullString());
- } catch (ClassNotFoundException e) {
+ } catch (Throwable t) {
//ignore error
- logger.error("publishProvider getServiceDescriptor error. providerUrl: " + providerUrl.toFullString(), e);
+ logger.error("publishProvider getServiceDescriptor error. providerUrl: " + providerUrl.toFullString(), t.getCause());
}
}
diff --git a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/InvokerTelnetHandlerTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/InvokerTelnetHandlerTest.java
index fd0f2b2..d8bcd0c 100644
--- a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/InvokerTelnetHandlerTest.java
+++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/InvokerTelnetHandlerTest.java
@@ -155,6 +155,20 @@ public class InvokerTelnetHandlerTest {
}
@Test
+ public void testInvokeMethodWithMapParameter() throws RemotingException {
+ mockChannel = mock(Channel.class);
+ given(mockChannel.getAttribute("telnet.service")).willReturn(DemoService.class.getName());
+ given(mockChannel.getLocalAddress()).willReturn(NetUtils.toAddress("127.0.0.1:5555"));
+ given(mockChannel.getRemoteAddress()).willReturn(NetUtils.toAddress("127.0.0.1:20886"));
+
+ registerProvider(DemoService.class.getName(), new DemoServiceImpl(), DemoService.class);
+
+ String param = "{1:\"Dubbo\",2:\"test\"}";
+ String result = invoke.telnet(mockChannel, "getMap(" + param + ")");
+ assertTrue(result.contains("result: {1:\"Dubbo\",2:\"test\"}"));
+ }
+
+ @Test
public void testInvokeMultiJsonParamMethod() throws RemotingException {
mockChannel = mock(Channel.class);
given(mockChannel.getAttribute("telnet.service")).willReturn(null);
diff --git a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/service/DemoService.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/service/DemoService.java
index c862f08..8ffa550 100644
--- a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/service/DemoService.java
+++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/service/DemoService.java
@@ -66,4 +66,6 @@ public interface DemoService {
String getPerson(Man man);
String getRemoteApplicationName();
+
+ Map<Integer, Object> getMap(Map<Integer, Object> map);
}
\ No newline at end of file
diff --git a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/service/DemoServiceImpl.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/service/DemoServiceImpl.java
index dcefeff..675aeba 100644
--- a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/service/DemoServiceImpl.java
+++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/service/DemoServiceImpl.java
@@ -126,4 +126,9 @@ public class DemoServiceImpl implements DemoService {
public String getRemoteApplicationName() {
return RpcContext.getContext().getRemoteApplicationName();
}
+
+ @Override
+ public Map<Integer, Object> getMap(Map<Integer, Object> map) {
+ return map;
+ }
}
\ No newline at end of file
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
index b152f85..1d33779 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
@@ -475,7 +475,7 @@ public class RegistryDirectory<T> extends AbstractDirectory<T> implements Notify
* @return
*/
private URL mergeUrl(URL providerUrl) {
- providerUrl = ClusterUtils.mergeUrl(providerUrl, queryMap); // Merge the consumer side parameters
+ providerUrl = ClusterUtils.mergeProviderUrl(providerUrl, queryMap); // Merge the consumer side parameters
providerUrl = overrideWithConfigurator(providerUrl);
diff --git a/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulRegistry.java b/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulRegistry.java
index d649076..990646a 100644
--- a/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulRegistry.java
+++ b/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulRegistry.java
@@ -45,8 +45,8 @@ import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -65,6 +65,7 @@ import static org.apache.dubbo.registry.consul.AbstractConsulRegistry.DEREGISTER
import static org.apache.dubbo.registry.consul.AbstractConsulRegistry.SERVICE_TAG;
import static org.apache.dubbo.registry.consul.AbstractConsulRegistry.URL_META_KEY;
import static org.apache.dubbo.registry.consul.AbstractConsulRegistry.WATCH_TIMEOUT;
+import static org.apache.dubbo.rpc.Constants.TOKEN_KEY;
/**
* registry center implementation for consul
@@ -78,15 +79,20 @@ public class ConsulRegistry extends FailbackRegistry {
new NamedThreadFactory("dubbo-consul-notifier", true));
private ConcurrentMap<URL, ConsulNotifier> notifiers = new ConcurrentHashMap<>();
private ScheduledExecutorService ttlConsulCheckExecutor;
+ /**
+ * The ACL token
+ */
+ private String token;
public ConsulRegistry(URL url) {
super(url);
+ token = url.getParameter(TOKEN_KEY, (String) null);
String host = url.getHost();
int port = url.getPort() != 0 ? url.getPort() : DEFAULT_PORT;
client = new ConsulClient(host, port);
checkPassInterval = url.getParameter(CHECK_PASS_INTERVAL, DEFAULT_CHECK_PASS_INTERVAL);
- ttlConsulCheckExecutor = Executors.newSingleThreadScheduledExecutor();
+ ttlConsulCheckExecutor = new ScheduledThreadPoolExecutor(1, new NamedThreadFactory("Ttl-Consul-Check-Executor", true));
ttlConsulCheckExecutor.scheduleAtFixedRate(this::checkPass, checkPassInterval / 8,
checkPassInterval / 8, TimeUnit.MILLISECONDS);
}
@@ -102,7 +108,11 @@ public class ConsulRegistry extends FailbackRegistry {
@Override
public void doRegister(URL url) {
- client.agentServiceRegister(buildService(url));
+ if (token == null) {
+ client.agentServiceRegister(buildService(url));
+ } else {
+ client.agentServiceRegister(buildService(url), token);
+ }
}
@Override
@@ -116,7 +126,11 @@ public class ConsulRegistry extends FailbackRegistry {
@Override
public void doUnregister(URL url) {
- client.agentServiceDeregister(buildId(url));
+ if (token == null) {
+ client.agentServiceDeregister(buildId(url));
+ } else {
+ client.agentServiceDeregister(buildId(url), token);
+ }
}
@Override
@@ -198,12 +212,16 @@ public class ConsulRegistry extends FailbackRegistry {
for (URL url : getRegistered()) {
String checkId = buildId(url);
try {
- client.agentCheckPass("service:" + checkId);
+ if (token == null) {
+ client.agentCheckPass("service:" + checkId);
+ } else {
+ client.agentCheckPass("service:" + checkId, null, token);
+ }
if (logger.isDebugEnabled()) {
logger.debug("check pass for url: " + url + " with check id: " + checkId);
}
} catch (Throwable t) {
- logger.warn("fail to check pass for url: " + url + ", check id is: " + checkId);
+ logger.warn("fail to check pass for url: " + url + ", check id is: " + checkId, t);
}
}
}
@@ -213,6 +231,7 @@ public class ConsulRegistry extends FailbackRegistry {
.setTag(SERVICE_TAG)
.setQueryParams(new QueryParams(watchTimeout, index))
.setPassing(true)
+ .setToken(token)
.build();
return client.getHealthServices(service, request);
}
@@ -220,6 +239,7 @@ public class ConsulRegistry extends FailbackRegistry {
private Response<Map<String, List<String>>> getAllServices(long index, int watchTimeout) {
CatalogServicesRequest request = CatalogServicesRequest.newBuilder()
.setQueryParams(new QueryParams(watchTimeout, index))
+ .setToken(token)
.build();
return client.getCatalogServices(request);
}
diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java
index 9abfc9a..f8925be 100644
--- a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java
+++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java
@@ -768,7 +768,7 @@ public class RegistryDirectoryTest {
List<Invoker<?>> invokers = registryDirectory.list(invocation);
Invoker<?> aInvoker = invokers.get(0);
//Need to be restored to the original providerUrl
- Assertions.assertEquals("1", aInvoker.getUrl().getParameter("timeout"));
+ Assertions.assertEquals("3", aInvoker.getUrl().getParameter("timeout"));
}
/**
diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java
index 5e0d8a4..af5fd95 100644
--- a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java
+++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java
@@ -30,7 +30,6 @@ import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.Protocol;
import org.apache.dubbo.rpc.Result;
-import org.apache.dubbo.rpc.cluster.support.FailfastCluster;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.ServiceDescriptor;
import org.apache.dubbo.rpc.protocol.AbstractInvoker;
@@ -86,7 +85,7 @@ public class RegistryProtocolTest {
public void testExportUrlNull() {
Assertions.assertThrows(IllegalArgumentException.class, () -> {
RegistryProtocol registryProtocol = getRegistryProtocol();
- registryProtocol.setCluster(new FailfastCluster());
+// registryProtocol.setCluster(new FailfastCluster());
Protocol dubboProtocol = DubboProtocol.getDubboProtocol();
registryProtocol.setProtocol(dubboProtocol);
@@ -99,7 +98,7 @@ public class RegistryProtocolTest {
@Test
public void testExport() {
RegistryProtocol registryProtocol = getRegistryProtocol();
- registryProtocol.setCluster(new FailfastCluster());
+// registryProtocol.setCluster(new FailfastCluster());
registryProtocol.setRegistryFactory(ExtensionLoader.getExtensionLoader(RegistryFactory.class).getAdaptiveExtension());
Protocol dubboProtocol = DubboProtocol.getDubboProtocol();
diff --git a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
index 5644474..789adee 100644
--- a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
+++ b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
@@ -27,6 +27,7 @@ import com.alibaba.nacos.api.NacosFactory;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
+import com.alibaba.nacos.api.naming.utils.NamingUtils;
import java.util.Properties;
@@ -90,7 +91,7 @@ public class NacosNamingServiceUtils {
*/
public static ServiceInstance toServiceInstance(Instance instance) {
DefaultServiceInstance serviceInstance = new DefaultServiceInstance(instance.getInstanceId(),
- instance.getServiceName(), instance.getIp(), instance.getPort());
+ NamingUtils.getServiceName(instance.getServiceName()), instance.getIp(), instance.getPort());
serviceInstance.setMetadata(instance.getMetadata());
serviceInstance.setEnabled(instance.isEnabled());
serviceInstance.setHealthy(instance.isHealthy());
diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServer.java b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServer.java
index d4ca4b3..9c4f1b8 100644
--- a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServer.java
+++ b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServer.java
@@ -149,8 +149,8 @@ public class NettyServer extends AbstractServer implements RemotingServer {
}
try {
if (bootstrap != null) {
- bossGroup.shutdownGracefully();
- workerGroup.shutdownGracefully();
+ bossGroup.shutdownGracefully().syncUninterruptibly();
+ workerGroup.shutdownGracefully().syncUninterruptibly();
}
} catch (Throwable e) {
logger.warn(e.getMessage(), e);
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AttachmentsAdapter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AttachmentsAdapter.java
index e145fba..1703792 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AttachmentsAdapter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AttachmentsAdapter.java
@@ -69,4 +69,4 @@ public class AttachmentsAdapter {
super.putAll(map);
}
}
-}
+}
\ No newline at end of file
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java
index b7698e8..f5fd982 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java
@@ -27,6 +27,7 @@ public interface Constants {
String DEPRECATED_KEY = "deprecated";
String $ECHO = "$echo";
+ String $ECHO_PARAMETER_DESC = "Ljava/lang/Object;";
String RETURN_PREFIX = "return ";
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java
index 81ad8df..291601a 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java
@@ -40,7 +40,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.INTERFACE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PATH_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER;
import static org.apache.dubbo.common.constants.CommonConstants.REMOTE_APPLICATION_KEY;
-import static org.apache.dubbo.common.constants.CommonConstants.TIMEOUT_ATTACHENT_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.TIMEOUT_ATTACHMENT_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.TIMEOUT_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.TIME_COUNTDOWN_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
@@ -71,7 +71,7 @@ public class ContextFilter implements Filter, Filter.Listener {
UNLOADING_KEYS.add(DUBBO_VERSION_KEY);
UNLOADING_KEYS.add(TOKEN_KEY);
UNLOADING_KEYS.add(TIMEOUT_KEY);
- UNLOADING_KEYS.add(TIMEOUT_ATTACHENT_KEY);
+ UNLOADING_KEYS.add(TIMEOUT_ATTACHMENT_KEY);
// Remove async property to avoid being passed to the following invoke chain.
UNLOADING_KEYS.add(ASYNC_KEY);
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericImplFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericImplFilter.java
index b66597e..31f6b50 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericImplFilter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericImplFilter.java
@@ -43,6 +43,7 @@ import java.lang.reflect.Type;
import static org.apache.dubbo.common.constants.CommonConstants.$INVOKE;
import static org.apache.dubbo.common.constants.CommonConstants.$INVOKE_ASYNC;
+import static org.apache.dubbo.common.constants.CommonConstants.GENERIC_PARAMETER_DESC;
import static org.apache.dubbo.rpc.Constants.GENERIC_KEY;
/**
@@ -55,8 +56,6 @@ public class GenericImplFilter implements Filter, Filter.Listener {
private static final Class<?>[] GENERIC_PARAMETER_TYPES = new Class<?>[]{String.class, String[].class, Object[].class};
- private static final String GENERIC_PARAMETER_DESC = "Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/Object;";
-
private static final String GENERIC_IMPL_MARKER = "GENERIC_IMPL";
@Override
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AsyncToSyncInvoker.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AsyncToSyncInvoker.java
index 69a3a28..9a18c91 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AsyncToSyncInvoker.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AsyncToSyncInvoker.java
@@ -29,6 +29,8 @@ import org.apache.dubbo.rpc.RpcInvocation;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
+import static org.apache.dubbo.common.constants.CommonConstants.TIMEOUT_KEY;
+
/**
* This class will work as a wrapper wrapping outside of each protocol invoker.
*
@@ -53,13 +55,22 @@ public class AsyncToSyncInvoker<T> implements Invoker<T> {
try {
if (InvokeMode.SYNC == ((RpcInvocation) invocation).getInvokeMode()) {
- /**
- * NOTICE!
- * must call {@link java.util.concurrent.CompletableFuture#get(long, TimeUnit)} because
- * {@link java.util.concurrent.CompletableFuture#get()} was proved to have serious performance drop.
- */
- asyncResult.get(Integer.MAX_VALUE, TimeUnit.MILLISECONDS);
+ //just to make timeout be more precise
+ Integer timeout = (Integer) invocation.get(TIMEOUT_KEY);
+ if (timeout != null) {
+ /**
+ * NOTICE!
+ * must call {@link java.util.concurrent.CompletableFuture#get(long, TimeUnit)} because
+ * {@link java.util.concurrent.CompletableFuture#get()} was proved to have serious performance drop.
+ */
+ asyncResult.get(timeout, TimeUnit.MILLISECONDS);
+ } else {
+ asyncResult.get(Integer.MAX_VALUE, TimeUnit.MILLISECONDS);
+ }
}
+ } catch (java.util.concurrent.TimeoutException timeoutException) {
+ throw new RpcException(RpcException.TIMEOUT_EXCEPTION, "Invoke remote method timeout. method: " +
+ invocation.getMethodName() + ", provider: " + getUrl() + ", cause: " + timeoutException.getMessage(), timeoutException);
} catch (InterruptedException e) {
throw new RpcException("Interrupted unexpectedly while waiting for remote result to return! method: " +
invocation.getMethodName() + ", provider: " + getUrl() + ", cause: " + e.getMessage(), e);
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolListenerWrapper.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolListenerWrapper.java
index 2f35f7c..b5fd2c7 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolListenerWrapper.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolListenerWrapper.java
@@ -39,7 +39,6 @@ import static org.apache.dubbo.common.constants.CommonConstants.INVOKER_LISTENER
/**
* ListenerProtocol
*/
-
@Activate(order = 200)
public class ProtocolListenerWrapper implements Protocol {
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/RpcUtils.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/RpcUtils.java
index 18f9f68..5e9e74a 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/RpcUtils.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/RpcUtils.java
@@ -34,13 +34,16 @@ import java.util.concurrent.atomic.AtomicLong;
import static org.apache.dubbo.common.constants.CommonConstants.$INVOKE;
import static org.apache.dubbo.common.constants.CommonConstants.$INVOKE_ASYNC;
-import static org.apache.dubbo.common.constants.CommonConstants.TIMEOUT_ATTACHENT_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.GENERIC_PARAMETER_DESC;
+import static org.apache.dubbo.common.constants.CommonConstants.TIMEOUT_ATTACHMENT_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.TIMEOUT_KEY;
import static org.apache.dubbo.rpc.Constants.$ECHO;
+import static org.apache.dubbo.rpc.Constants.$ECHO_PARAMETER_DESC;
import static org.apache.dubbo.rpc.Constants.ASYNC_KEY;
import static org.apache.dubbo.rpc.Constants.AUTO_ATTACH_INVOCATIONID_KEY;
import static org.apache.dubbo.rpc.Constants.ID_KEY;
import static org.apache.dubbo.rpc.Constants.RETURN_KEY;
+
/**
* RpcUtils
*/
@@ -98,7 +101,7 @@ public class RpcUtils {
*/
public static void attachInvocationIdIfAsync(URL url, Invocation inv) {
if (isAttachInvocationId(url, inv) && getInvocationId(inv) == null && inv instanceof RpcInvocation) {
- ((RpcInvocation) inv).setAttachment(ID_KEY, String.valueOf(INVOKE_ID.getAndIncrement()));
+ inv.setAttachment(ID_KEY, String.valueOf(INVOKE_ID.getAndIncrement()));
}
}
@@ -154,6 +157,14 @@ public class RpcUtils {
public static boolean isAsync(URL url, Invocation inv) {
boolean isAsync;
+
+ if (inv instanceof RpcInvocation) {
+ RpcInvocation rpcInvocation = (RpcInvocation) inv;
+ if (rpcInvocation.getInvokeMode() != null) {
+ return rpcInvocation.getInvokeMode() == InvokeMode.ASYNC;
+ }
+ }
+
if (Boolean.TRUE.toString().equals(inv.getAttachment(ASYNC_KEY))) {
isAsync = true;
} else {
@@ -176,15 +187,24 @@ public class RpcUtils {
return $INVOKE_ASYNC.equals(inv.getMethodName());
}
- public static boolean isGenericCall(String path, String method) {
- return $INVOKE.equals(method) || $INVOKE_ASYNC.equals(method);
+ // check parameterTypesDesc to fix CVE-2020-1948
+ public static boolean isGenericCall(String parameterTypesDesc, String method) {
+ return ($INVOKE.equals(method) || $INVOKE_ASYNC.equals(method)) && GENERIC_PARAMETER_DESC.equals(parameterTypesDesc);
}
- public static boolean isEcho(String path, String method) {
- return $ECHO.equals(method);
+ // check parameterTypesDesc to fix CVE-2020-1948
+ public static boolean isEcho(String parameterTypesDesc, String method) {
+ return $ECHO.equals(method) && $ECHO_PARAMETER_DESC.equals(parameterTypesDesc);
}
public static InvokeMode getInvokeMode(URL url, Invocation inv) {
+ if (inv instanceof RpcInvocation) {
+ RpcInvocation rpcInvocation = (RpcInvocation) inv;
+ if (rpcInvocation.getInvokeMode() != null) {
+ return rpcInvocation.getInvokeMode();
+ }
+ }
+
if (isReturnTypeFuture(inv)) {
return InvokeMode.FUTURE;
} else if (isAsync(url, inv)) {
@@ -217,7 +237,7 @@ public class RpcUtils {
public static long getTimeout(Invocation invocation, long defaultTimeout) {
long timeout = defaultTimeout;
- Object genericTimeout = invocation.getObjectAttachment(TIMEOUT_ATTACHENT_KEY);
+ Object genericTimeout = invocation.getObjectAttachment(TIMEOUT_ATTACHMENT_KEY);
if (genericTimeout != null) {
timeout = convertToNumber(genericTimeout, defaultTimeout);
}
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter b/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
index 4aa777f..5255f55 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
@@ -11,4 +11,5 @@ exception=org.apache.dubbo.rpc.filter.ExceptionFilter
executelimit=org.apache.dubbo.rpc.filter.ExecuteLimitFilter
deprecated=org.apache.dubbo.rpc.filter.DeprecatedFilter
compatible=org.apache.dubbo.rpc.filter.CompatibleFilter
-timeout=org.apache.dubbo.rpc.filter.TimeoutFilter
\ No newline at end of file
+timeout=org.apache.dubbo.rpc.filter.TimeoutFilter
+tps=org.apache.dubbo.rpc.filter.TpsLimitFilter
\ No newline at end of file
diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java
index 7e7e1df..b34245a 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java
@@ -157,6 +157,7 @@ public class RpcContextTest {
rpcContext.stopAsync();
Assertions.assertTrue(rpcContext.isAsyncStarted());
+ RpcContext.removeContext();
}
@Test
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java
index 7a60e0e..eead37c 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java
@@ -24,6 +24,7 @@ import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.ConcurrentHashSet;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.remoting.Channel;
+import org.apache.dubbo.remoting.Constants;
import org.apache.dubbo.remoting.RemotingException;
import org.apache.dubbo.rpc.Exporter;
import org.apache.dubbo.rpc.Invocation;
@@ -113,7 +114,9 @@ class CallbackServiceCodec {
}
}
tmpMap.putAll(params);
+
tmpMap.remove(VERSION_KEY);// doesn't need to distinguish version for callback
+ tmpMap.remove(Constants.BIND_PORT_KEY); //callback doesn't needs bind.port
tmpMap.put(INTERFACE_KEY, clazz.getName());
URL exportUrl = new URL(DubboProtocol.NAME, channel.getLocalAddress().getAddress().getHostAddress(), channel.getLocalAddress().getPort(), clazz.getName() + "." + instid, tmpMap);
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java
index c5f6a0a..f286ddb 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java
@@ -130,7 +130,7 @@ public class DecodeableRpcInvocation extends RpcInvocation implements Codec, Dec
}
}
if (pts == DubboCodec.EMPTY_CLASS_ARRAY) {
- if (!RpcUtils.isGenericCall(path, getMethodName()) && !RpcUtils.isEcho(path, getMethodName())) {
+ if (!RpcUtils.isGenericCall(desc, getMethodName()) && !RpcUtils.isEcho(desc, getMethodName())) {
throw new IllegalArgumentException("Service not found:" + path + ", " + getMethodName());
}
pts = ReflectUtils.desc2classArray(desc);
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java
index d88ae54..4fc52f7 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java
@@ -47,7 +47,8 @@ import static org.apache.dubbo.common.constants.CommonConstants.ENABLE_TIMEOUT_C
import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.INTERFACE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PATH_KEY;
-import static org.apache.dubbo.common.constants.CommonConstants.TIMEOUT_ATTACHENT_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.TIMEOUT_ATTACHMENT_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.TIMEOUT_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.TIME_COUNTDOWN_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
import static org.apache.dubbo.rpc.Constants.TOKEN_KEY;
@@ -95,6 +96,7 @@ public class DubboInvoker<T> extends AbstractInvoker<T> {
try {
boolean isOneway = RpcUtils.isOneway(getUrl(), invocation);
int timeout = calculateTimeout(invocation, methodName);
+ invocation.put(TIMEOUT_KEY, timeout);
if (isOneway) {
boolean isSent = getUrl().getMethodParameter(methodName, Constants.SENT_KEY, false);
currentClient.send(inv, isSent);
@@ -168,12 +170,12 @@ public class DubboInvoker<T> extends AbstractInvoker<T> {
if (countdown == null) {
timeout = (int) RpcUtils.getTimeout(getUrl(), methodName, RpcContext.getContext(), DEFAULT_TIMEOUT);
if (getUrl().getParameter(ENABLE_TIMEOUT_COUNTDOWN_KEY, false)) {
- invocation.setObjectAttachment(TIMEOUT_ATTACHENT_KEY, timeout); // pass timeout to remote server
+ invocation.setObjectAttachment(TIMEOUT_ATTACHMENT_KEY, timeout); // pass timeout to remote server
}
} else {
TimeoutCountDown timeoutCountDown = (TimeoutCountDown) countdown;
timeout = (int) timeoutCountDown.timeRemaining(TimeUnit.MILLISECONDS);
- invocation.setObjectAttachment(TIMEOUT_ATTACHENT_KEY, timeout);// pass timeout to remote server
+ invocation.setObjectAttachment(TIMEOUT_ATTACHMENT_KEY, timeout);// pass timeout to remote server
}
return timeout;
}
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ArgumentCallbackTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ArgumentCallbackTest.java
index a51244a..c3ccb33 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ArgumentCallbackTest.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ArgumentCallbackTest.java
@@ -16,6 +16,14 @@
*/
package org.apache.dubbo.rpc.protocol.dubbo;
+import static org.apache.dubbo.common.constants.CommonConstants.CALLBACK_INSTANCES_LIMIT_KEY;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.rpc.Exporter;
@@ -23,20 +31,12 @@ import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.protocol.dubbo.support.ProtocolUtils;
-
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-import static org.apache.dubbo.common.constants.CommonConstants.CALLBACK_INSTANCES_LIMIT_KEY;
+import org.apache.dubbo.remoting.Constants;
public class ArgumentCallbackTest {
@@ -104,6 +104,27 @@ public class ArgumentCallbackTest {
} catch (Exception e) {
}
}
+
+ @Test
+ public void TestCallbackNormalWithBindPort() throws Exception {
+ initOrResetUrl(1, 10000000);
+ consumerUrl = serviceURL.addParameter(Constants.BIND_PORT_KEY,"7653");
+ initOrResetService();
+
+ final AtomicInteger count = new AtomicInteger(0);
+
+ demoProxy.xxx(new IDemoCallback() {
+ public String yyy(String msg) {
+ System.out.println("Recived callback: " + msg);
+ count.incrementAndGet();
+ return "ok";
+ }
+ }, "other custom args", 10, 100);
+ System.out.println("Async...");
+ assertCallbackCount(10, 100, count);
+ destroyService();
+
+ }
@Test
public void TestCallbackNormal() throws Exception {
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftInvoker.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftInvoker.java
index a18925d..08e6ed1 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftInvoker.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftInvoker.java
@@ -94,6 +94,7 @@ public class ThriftInvoker<T> extends AbstractInvoker<T> {
try {
int timeout = getUrl().getMethodParameter(methodName, TIMEOUT_KEY, DEFAULT_TIMEOUT);
+ invocation.put(TIMEOUT_KEY, timeout);
ExecutorService executor = getCallbackExecutor(getUrl(), inv);
CompletableFuture<AppResponse> appResponseFuture = currentClient.request(inv, timeout, executor).thenApply(obj -> (AppResponse) obj);
diff --git a/pom.xml b/pom.xml
index 473cb7b..87ccccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
<arguments />
<checkstyle.skip>true</checkstyle.skip>
<rat.skip>true</rat.skip>
- <revision>2.7.7-qlj-SNAPSHOT</revision>
+ <revision>2.7.8-qlj-SNAPSHOT</revision>
</properties>
<modules>
@@ -625,6 +625,19 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${maven_source_version}</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>