Fix use generic invocation via API , lost "version" value [#4784]

[z529192557]

What is the purpose of the change

fix use generic invocation via API , lost "version" value

Brief changelog

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java

Issues

• Use generic invocation via API , lost "version" value #4784

[codecov-io]

Codecov Report

Merging #4787 into master will decrease coverage by 0.06%.
The diff coverage is 100%.

@@             Coverage Diff              @@
##             master    #4787      +/-   ##
============================================
- Coverage     63.92%   63.86%   -0.07%     
+ Complexity      451      450       -1     
============================================
  Files           769      769              
  Lines         33180    33182       +2     
  Branches       5230     5218      -12     
============================================
- Hits          21211    21192      -19     
- Misses         9547     9558      +11     
- Partials       2422     2432      +10

Impacted Files	Coverage Δ	Complexity Δ
...apache/dubbo/rpc/cluster/support/ClusterUtils.java	83.33% <100%> (+0.83%)	0 <0> (ø)	⬇️
...ache/dubbo/remoting/transport/AbstractChannel.java	75% <0%> (-12.5%)	0% <0%> (ø)
.../apache/dubbo/rpc/protocol/AsyncToSyncInvoker.java	79.16% <0%> (-8.34%)	0% <0%> (ø)
...apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java	53.84% <0%> (-7.7%)	0% <0%> (ø)
...onfig/spring/extension/SpringExtensionFactory.java	78.04% <0%> (-7.32%)	0% <0%> (ø)
...ng/exchange/support/header/HeartbeatTimerTask.java	73.68% <0%> (-5.27%)	0% <0%> (ø)
...bbo/registry/support/ProviderConsumerRegTable.java	80.48% <0%> (-4.88%)	0% <0%> (ø)
...ache/dubbo/rpc/protocol/ProtocolFilterWrapper.java	85% <0%> (-3.34%)	0% <0%> (ø)
...pache/dubbo/registry/support/AbstractRegistry.java	78.54% <0%> (-3.07%)	0% <0%> (ø)
...bo/rpc/protocol/dubbo/telnet/LogTelnetHandler.java	68.57% <0%> (-2.86%)	0% <0%> (ø)
... and 18 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 165d975...95fbf55. Read the comment docs.

[tswstarplanet]

This pr can solve the problem, but I found the code is confusing.
If we use direct invoke, usually the direct link url doesn't have parameters(because we can define parameters in reference directly. So the remoteUrl in ClusterUtils.mergeUrl method is empty. So it doesn't have group and version key.

If we don't use direct invoke, and either group or version of ReferenceConfig and ServiceConfig is different, it will not go into the ClusterUtils.merge method.

Maybe we can split the ClusterUtils.merge method into two methods, one is used by direct invoke. The other is used by the indirect invoke.

[z529192557]

This pr can solve the problem, but I found the code is confusing.
If we use direct invoke, usually the direct link url doesn't have parameters(because we can define parameters in reference directly. So the remoteUrl in ClusterUtils.mergeUrl method is empty. So it doesn't have group and version key.

If we don't use direct invoke, and either group or version of ReferenceConfig and ServiceConfig is different, it will not go into the ClusterUtils.merge method.

Maybe we can split the ClusterUtils.merge method into two methods, one is used by direct invoke. The other is used by the indirect invoke.

I read the code ZookeeperRegistry.toUrlsWithEmpty, I found

• if the ”group“ or” version“ is mismatching，the url will not be passed to next process.
• so when invoke the RegistryDirectory.toInvokers, the group or version is always equel between ReferenceConfig and ServiceConfig.
• then the method "ClusterUtils.merge()" merge the provider's "gourp" or "version" value and consumer's "gourp" or "version" value is redundant.

So I think , when provider does not have "group" or "version" (generally direct invoke) ，then do not remove "group" or "version" key from local map，it can meet both direct invoke and from registry.

[tswstarplanet]

LGTM

[chickenlj]

Test if other parameters have have the same problem