[Dubbo-3069] Fix NumberFormatException for input string "" #3076

maoyiz · 2018-12-27T05:46:40Z

Fix #3069

What is the purpose of the change

Fix NumberFormatException for input string "" or " " or null in convertPrimitive(Class<?> type, String value)

Brief changelog

Update files:

ClassHelper
StringUtils
ClassHelperTest
StringUtilsTest

Verifying this change

Follow this checklist to help us incorporate your contribution quickly and easily:

Make sure there is a GITHUB_issue field for the change (usually before you start working on it). Trivial changes like typos do not require a GITHUB issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
Format the pull request title like [Dubbo-XXX] Fix UnknownException when host config not exist #XXX. Each commit in the pull request should have a meaningful subject line and body.
Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
Run mvn clean install -DskipTests & mvn clean test-compile failsafe:integration-test to make sure unit-test and integration-test pass.
If this contribution is large, please follow the Software Donation Guide.

…Primitive()

cdfive · 2018-12-27T06:05:01Z

Hi, @zhaixiaoxiang

if (type == char.class || type == Character.class) {
    return value.length() > 0 ? value.charAt(0) : '\0';
}

Return '\0' may be confusing.

How about put the if StringUtils.isRealBlank(value) in the first line of this method?
But be careful if the '\0' is used in other place.

carryxyh · 2018-12-27T07:03:06Z

duplicate: #3075

maoyiz · 2018-12-27T07:20:06Z

Hi, @zhaixiaoxiang
if (type == char.class || type == Character.class) {
    return value.length() > 0 ? value.charAt(0) : '\0';
}
Return '\0' may be confusing.

How about put the if StringUtils.isRealBlank(value) in the first line of this method?
But be careful if the '\0' is used in other place.

Yes, ClassHelper.convertPrimitive() is only used in one place, and '\0' is not used, so I remove '\0'.

if (StringUtils.isNotEmpty(value) && ClassHelper.isTypeMatch(method.getParameterTypes()[0], value)) {
    method.invoke(this, ClassHelper.convertPrimitive(method.getParameterTypes()[0], value));
}

khanimteyaz · 2018-12-27T19:47:30Z

dubbo-common/src/main/java/org/apache/dubbo/common/utils/StringUtils.java

@@ -343,6 +343,20 @@ public static boolean isBlank(String str) {
        return isEmpty(str);
    }

+    public static boolean isRealBlank(CharSequence cs) {
+        int strLen;
+        if (cs != null && (strLen = cs.length()) != 0) {


Can be replaced by 'StringUtils.isNotEmpty(cs)'

plz ignore my comment.

khanimteyaz · 2018-12-27T19:56:07Z

dubbo-common/src/main/java/org/apache/dubbo/common/utils/StringUtils.java

@@ -343,6 +343,20 @@ public static boolean isBlank(String str) {
        return isEmpty(str);
    }

+    public static boolean isRealBlank(CharSequence cs) {


can be replace is

public static boolean isRealBlank(CharSequence cs) { int strLen; if (cs != null && (strLen = cs.length()) != 0) { for (int i = 0; i < strLen; ++i) { if (!Character.isWhitespace(cs.charAt(i))) { return false; } } } return true; }

Hi, what can be replaced by what?

existing isRealBlank can be change with given one. It is not exact replacement, I have paste the whole code of isRealBlank with modified one so that you don't have to spend time modifying line by line. In the modified one I have remove the extra return statement because the return at the end of method is good enough for the purpose.

codecov-io · 2018-12-29T02:21:33Z

Codecov Report

❗ No coverage uploaded for pull request base (master@0282a42). Click here to learn what that means.
The diff coverage is 84.21%.

@@            Coverage Diff            @@
##             master    #3076   +/-   ##
=========================================
  Coverage          ?   63.56%           
  Complexity        ?       75           
=========================================
  Files             ?      653           
  Lines             ?    28228           
  Branches          ?     4807           
=========================================
  Hits              ?    17943           
  Misses            ?     8010           
  Partials          ?     2275

Impacted Files	Coverage Δ	Complexity Δ
...java/org/apache/dubbo/rpc/cluster/RouterChain.java	`96.87% <ø> (ø)`	`0 <0> (?)`
...ster/router/condition/config/AppRouterFactory.java	`88.88% <ø> (ø)`	`0 <0> (?)`
.../dubbo/registry/integration/RegistryDirectory.java	`80% <0%> (ø)`	`0 <0> (?)`
...ava/org/apache/dubbo/common/utils/StringUtils.java	`86.85% <100%> (ø)`	`0 <0> (?)`
...ava/org/apache/dubbo/common/utils/ClassHelper.java	`69.72% <83.33%> (ø)`	`0 <0> (?)`
...ster/router/condition/config/ListenableRouter.java	`28.57% <83.33%> (ø)`	`0 <0> (?)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0282a42...925ccfb. Read the comment docs.

ralf0131

Hi, there are too many unrelated changes.
Please focus on one single improvement at a time.

ralf0131 · 2019-01-03T08:17:51Z

dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassHelper.java

        } else if (type == boolean.class || type == Boolean.class) {
            return Boolean.valueOf(value);
+        } else if (StringUtils.isRealBlank(value)) {


Hi,

I think we don't need to call isRealBlank, because there is too much to check. If we really want to check, we need to make sure the input value is numeric. I have left comment on #3093

khanimteyaz · 2019-01-03T09:22:09Z

dubbo-common/src/main/java/org/apache/dubbo/common/utils/StringUtils.java

+                    return false;
+                }
+            }
+            return true;


I think this return (after for loop)is not requires and remove the else and keep just return true;

[Dubbo-3069] Fix NumberFormatException for input string "" in convert…

e357057

…Primitive()

[Dubbo-3069] optimize

6fa787b

carryxyh mentioned this pull request Dec 27, 2018

fix #3069 #3075

Closed

6 tasks

zhaixiaoxiang and others added 7 commits December 27, 2018 15:29

Merge remote-tracking branch 'apache/master' into issue-3069

ab8ab75

[Dubbo-3069] optimize

eadabf5

Revert code to avoid NPE in RPC wire after providers are cleared.

c18b1cf

make ListenableRouter code thread safe

4cf3e38

Fix UT

dc1dec5

Remove assert check to continue with execute.

0b700a7

solve compile error

9c0e3ef

khanimteyaz reviewed Dec 27, 2018

View reviewed changes

Merge branch 'master' into issue-3069

925ccfb

ralf0131 reviewed Jan 3, 2019

View reviewed changes

khanimteyaz reviewed Jan 3, 2019

View reviewed changes

maoyiz closed this Jan 3, 2019

maoyiz deleted the issue-3069 branch January 3, 2019 09:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Dubbo-3069] Fix NumberFormatException for input string "" #3076

[Dubbo-3069] Fix NumberFormatException for input string "" #3076

maoyiz commented Dec 27, 2018

cdfive commented Dec 27, 2018 •

edited

Loading

carryxyh commented Dec 27, 2018

maoyiz commented Dec 27, 2018 •

edited

Loading

khanimteyaz Dec 27, 2018

khanimteyaz Dec 27, 2018

khanimteyaz Dec 27, 2018

maoyiz Dec 28, 2018

khanimteyaz Jan 3, 2019

codecov-io commented Dec 29, 2018

ralf0131 left a comment

ralf0131 Jan 3, 2019

khanimteyaz Jan 3, 2019

[Dubbo-3069] Fix NumberFormatException for input string "" #3076

[Dubbo-3069] Fix NumberFormatException for input string "" #3076

Conversation

maoyiz commented Dec 27, 2018

What is the purpose of the change

Brief changelog

Verifying this change

cdfive commented Dec 27, 2018 • edited Loading

carryxyh commented Dec 27, 2018

maoyiz commented Dec 27, 2018 • edited Loading

khanimteyaz Dec 27, 2018

Choose a reason for hiding this comment

khanimteyaz Dec 27, 2018

Choose a reason for hiding this comment

khanimteyaz Dec 27, 2018

Choose a reason for hiding this comment

maoyiz Dec 28, 2018

Choose a reason for hiding this comment

khanimteyaz Jan 3, 2019

Choose a reason for hiding this comment

codecov-io commented Dec 29, 2018

Codecov Report

ralf0131 left a comment

Choose a reason for hiding this comment

ralf0131 Jan 3, 2019

Choose a reason for hiding this comment

khanimteyaz Jan 3, 2019

Choose a reason for hiding this comment

cdfive commented Dec 27, 2018 •

edited

Loading

maoyiz commented Dec 27, 2018 •

edited

Loading