Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove parameters from registryUrl to prevent config pollution #7189

Merged
merged 6 commits into from
Feb 22, 2021
Merged

Remove parameters from registryUrl to prevent config pollution #7189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8fdce6f
clear parameter from registry url, preventing from polluting consumerUrl
AlbumenJ Feb 12, 2021
65b8dac
recover most of param
AlbumenJ Feb 12, 2021
158a8ac
make remove parameters optional
AlbumenJ Feb 13, 2021
67f2242
fix refer
AlbumenJ Feb 13, 2021
4e3e9c1
recover crlf
AlbumenJ Feb 20, 2021
e4a1524
recover crlf
AlbumenJ Feb 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@

/**
* Abstract implementation of Directory: Invoker list returned from this Directory's list method have been filtered by Routers
*
*/
public abstract class AbstractDirectory<T> implements Directory<T> {

Expand All @@ -59,10 +58,14 @@ public abstract class AbstractDirectory<T> implements Directory<T> {
protected RouterChain<T> routerChain;

public AbstractDirectory(URL url) {
this(url, null);
this(url, null, false);
}

public AbstractDirectory(URL url, boolean isUrlFromRegistry) {
this(url, null, isUrlFromRegistry);
}

public AbstractDirectory(URL url, RouterChain<T> routerChain) {
public AbstractDirectory(URL url, RouterChain<T> routerChain, boolean isUrlFromRegistry) {
if (url == null) {
throw new IllegalArgumentException("url == null");
}
Expand All @@ -72,8 +75,13 @@ public AbstractDirectory(URL url, RouterChain<T> routerChain) {
this.consumedProtocol = this.queryMap.get(PROTOCOL_KEY) == null ? DUBBO : this.queryMap.get(PROTOCOL_KEY);
this.url = url.removeParameter(REFER_KEY).removeParameter(MONITOR_KEY);

this.consumerUrl = this.url.setProtocol(consumedProtocol).setPath(path == null ? queryMap.get(INTERFACE_KEY) : path).addParameters(queryMap)
.removeParameter(MONITOR_KEY);
URL consumerUrlFrom = this.url.setProtocol(consumedProtocol)
.setPath(path == null ? queryMap.get(INTERFACE_KEY) : path);
if (isUrlFromRegistry) {
// reserve parameters if url is already a consumer url
consumerUrlFrom = consumerUrlFrom.clearParameters();
chickenlj marked this conversation as resolved.
Show resolved Hide resolved
}
this.consumerUrl = consumerUrlFrom.addParameters(queryMap).removeParameter(MONITOR_KEY);

setRouterChain(routerChain);
}
Expand Down
2 changes: 1 addition & 1 deletion dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public StaticDirectory(URL url, List<Invoker<T>> invokers) {
}

public StaticDirectory(URL url, List<Invoker<T>> invokers, RouterChain<T> routerChain) {
super(url == null && CollectionUtils.isNotEmpty(invokers) ? invokers.get(0).getUrl() : url, routerChain);
super(url == null && CollectionUtils.isNotEmpty(invokers) ? invokers.get(0).getUrl() : url, routerChain, false);
if (CollectionUtils.isEmpty(invokers)) {
throw new IllegalArgumentException("invokers == null");
}
Expand Down
2 changes: 1 addition & 1 deletion ...bo-registry-api/src/main/java/org/apache/dubbo/registry/integration/DynamicDirectory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public abstract class DynamicDirectory<T> extends AbstractDirectory<T> implement
protected ServiceInstancesChangedListener serviceListener;

public DynamicDirectory(Class<T> serviceType, URL url) {
super(url);
super(url, true);
if (serviceType == null) {
throw new IllegalArgumentException("service type is null.");
}
Expand Down