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

fix for #4111 do not ignore empty value when we construct servicename #4112

Merged
merged 4 commits into from
May 23, 2019
Merged

fix for #4111 do not ignore empty value when we construct servicename #4112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1eae69d
update erlang link
May 20, 2019
f384563
fix for #4111
May 22, 2019
3bb8bb2
fix : version is optional
May 22, 2019
3904168
fix : ArrayOutOfBounds
May 22, 2019
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ Please report security vulnerability to [us](mailto:[email protected]
* [Python](https://github.com/dubbo/dubbo-client-py)
* [PHP](https://github.com/dubbo/dubbo-php-framework)
* [Go](https://github.com/dubbo/dubbo-go)
* [Erlang](https://github.com/dubboerl/dubboerl)
* [Erlang](https://github.com/apache/incubator-dubbo-erlang)

## License

Expand Down
22 changes: 11 additions & 11 deletions ...try/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,19 +278,19 @@ private void filterServiceNames(List<String> serviceNames, URL url) {

final String targetServiceInterface = url.getServiceInterface();

final String targetVersion = url.getParameter(VERSION_KEY);
final String targetVersion = url.getParameter(VERSION_KEY,"");

final String targetGroup = url.getParameter(GROUP_KEY);
final String targetGroup = url.getParameter(GROUP_KEY,"");

filterData(serviceNames, serviceName -> {
// split service name to segments
// (required) segments[0] = category
// (required) segments[1] = serviceInterface
// (required) segments[2] = version
// (optional) segments[2] = version
// (optional) segments[3] = group
String[] segments = StringUtils.split(serviceName, SERVICE_NAME_SEPARATOR);
int length = segments.length;
if (length < 3) { // must present 3 segments or more
if (length != 4) { // must present 4 segments
return false;
}

Expand All @@ -311,8 +311,7 @@ private void filterServiceNames(List<String> serviceNames, URL url) {
return false;
}

String group = length > 3 ? segments[SERVICE_GROUP_INDEX] : null;
// no match service group
String group = segments[SERVICE_GROUP_INDEX];
return group == null || WILDCARD.equals(targetGroup)
|| StringUtils.equals(targetGroup, group);
});
Expand Down Expand Up @@ -420,16 +419,17 @@ private String getServiceName(URL url) {

private String getServiceName(URL url, String category) {
StringBuilder serviceNameBuilder = new StringBuilder(category);
appendIfPresent(serviceNameBuilder, url, INTERFACE_KEY);
appendIfPresent(serviceNameBuilder, url, VERSION_KEY);
appendIfPresent(serviceNameBuilder, url, GROUP_KEY);
append(serviceNameBuilder, url, INTERFACE_KEY);
append(serviceNameBuilder, url, VERSION_KEY);
append(serviceNameBuilder, url, GROUP_KEY);
return serviceNameBuilder.toString();
}

private void appendIfPresent(StringBuilder target, URL url, String parameterName) {
private void append(StringBuilder target, URL url, String parameterName) {
target.append(SERVICE_NAME_SEPARATOR);
String parameterValue = url.getParameter(parameterName);
if (!StringUtils.isBlank(parameterValue)) {
target.append(SERVICE_NAME_SEPARATOR).append(parameterValue);
target.append(parameterValue);
}
}

Expand Down