Skip to content

When PropertyValue "parameters" is [null] or [EMPTY], return to HashMap that can be modified #12354

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

Merged
AlbumenJ merged 2 commits into from
May 21, 2023
Merged

When PropertyValue "parameters" is [null] or [EMPTY], return to HashMap that can be modified #12354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8270187
org.apache.dubbo.config.spring.util.DubboAnnotationUtils.convertParam…
May 19, 2023
c6d5a12
getParameters 补充this
May 19, 2023
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
5 changes: 4 additions & 1 deletion dubbo-common/src/main/java/org/apache/dubbo/config/AbstractMethodConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
import org.apache.dubbo.rpc.model.ScopeModel;

import java.beans.Transient;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;

/**
* AbstractMethodConfig
Expand Down Expand Up @@ -240,7 +242,8 @@ public void setValidation(String validation) {
}

public Map<String, String> getParameters() {
return parameters;
this.parameters = Optional.ofNullable(this.parameters).orElseGet(HashMap::new);
return this.parameters;
}

public void setParameters(Map<String, String> parameters) {
Expand Down
4 changes: 2 additions & 2 deletions ...config-spring/src/main/java/org/apache/dubbo/config/spring/util/DubboAnnotationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -154,7 +154,7 @@ public static String resolveInterfaceName(Reference reference, Class<?> defaultI
*/
public static Map<String, String> convertParameters(String[] parameters) {
if (ArrayUtils.isEmpty(parameters)) {
return Collections.emptyMap();
return new HashMap<>();
Copy link
Member

@AlbumenJ AlbumenJ May 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Null return in org.apache.dubbo.config.AbstractMethodConfig#getParameters is also need to be considered

}

List<String> compatibleParameterArray = Arrays.stream(parameters)
Expand Down