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 #4114

Merged
merged 1 commit into from
May 22, 2019
Merged

fix for #4111 #4114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 8 additions & 11 deletions ...egistry-api/src/main/java/com/alibaba/dubbo/registry/support/ServiceInstanceRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,16 +430,19 @@ public static String getServiceName(URL url) {

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

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

public static String[] getServiceSegments(String serviceName) {
Expand All @@ -465,10 +468,4 @@ public static String getServiceGroup(String[] segments) {
private static <T> T[] of(T... values) {
return values;
}

private static void appendIfPresent(StringBuilder target, String parameterValue) {
if (StringUtils.isNotEmpty(parameterValue)) {
target.append(SERVICE_NAME_SEPARATOR).append(parameterValue);
}
}
}