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.
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
Use MapUtils instead of AttachmentsAdapter #8772
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
a932a99
Use MapUtils instead of AttachmentsAdapter
manzhizhen 6af1d17
Use MapUtils instead of AttachmentsAdapter
manzhizhen e975cdb
Use MapUtils instead of AttachmentsAdapter
manzhizhen 3c20720
Use MapUtils instead of AttachmentsAdapter
manzhizhen d249819
Use MapUtils instead of AttachmentsAdapter
manzhizhen 23f0302
Use MapUtils instead of AttachmentsAdapter
manzhizhen 327144f
Use MapUtils instead of AttachmentsAdapter
manzhizhen 49a3b06
Use MapUtils instead of AttachmentsAdapter
manzhizhen File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
dubbo-common/src/main/java/org/apache/dubbo/common/utils/MapUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.dubbo.common.utils; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * Map tools | ||
| */ | ||
| public class MapUtils { | ||
|
|
||
| /** | ||
| * switch Map<String, Object> to Map<String, String> | ||
| * | ||
| * If the value of the original Map is not of type String, then toString() of value will be called | ||
| * | ||
| * @param originMap | ||
| * @return | ||
| */ | ||
| public static Map<String, String> objectToStringMap(Map<String, Object> originMap) { | ||
| Map<String, String> newStrMap = new HashMap<>(); | ||
|
|
||
| if (originMap == null) { | ||
| return newStrMap; | ||
| } | ||
|
|
||
| for (Map.Entry<String, Object> entry : originMap.entrySet()) { | ||
| String stringValue = convertToString(entry.getValue()); | ||
| if (stringValue != null) { | ||
| newStrMap.put(entry.getKey(), stringValue); | ||
| } | ||
| } | ||
|
|
||
| return newStrMap; | ||
| } | ||
|
|
||
| /** | ||
| * use {@link Object#toString()} switch Obj to String | ||
| * | ||
| * @param obj | ||
| * @return | ||
| */ | ||
| private static String convertToString(Object obj) { | ||
| if (obj == null) { | ||
| return null; | ||
| } else { | ||
| return obj.toString(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this file method
converthas problem, if object type is not string, it will return null, cound you fix it convenientlyThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, the new method takes this into consideration, calling Object#toString() directly。Using JSON here may not be the best choice.