This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 9f63286 improve version parsing (#291)
9f63286 is described below
commit 9f63286c532525aa113386ea72601fd0da48997d
Author: Gong Dewei <[email protected]>
AuthorDate: Fri Mar 19 23:31:16 2021 +0800
improve version parsing (#291)
---
.../java/org/apache/dubbo/scenario/builder/VersionMatcher.java | 8 ++++++--
.../org/apache/dubbo/scenario/builder/VersionMatcherTest.java | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git
a/test/dubbo-scenario-builder/src/main/java/org/apache/dubbo/scenario/builder/VersionMatcher.java
b/test/dubbo-scenario-builder/src/main/java/org/apache/dubbo/scenario/builder/VersionMatcher.java
index 522bb68..62d0684 100644
---
a/test/dubbo-scenario-builder/src/main/java/org/apache/dubbo/scenario/builder/VersionMatcher.java
+++
b/test/dubbo-scenario-builder/src/main/java/org/apache/dubbo/scenario/builder/VersionMatcher.java
@@ -428,7 +428,11 @@ public class VersionMatcher {
int[] ints = new int[4];
for (int i = 0; i < ints.length; i++) {
if (vers.length > i) {
- ints[i] = Integer.parseInt(vers[i]);
+ try {
+ ints[i] = Integer.parseInt(vers[i]);
+ } catch (NumberFormatException e) {
+ //ignore part
+ }
} else {
break;
}
@@ -437,7 +441,7 @@ public class VersionMatcher {
}
private static String trimVersion(String version) {
- //remove '-SNAPSHOT'
+ //remove '-' suffix, such as '-SNAPSHOT'
int p = version.indexOf('-');
if (p > 0) {
version = version.substring(0, p);
diff --git
a/test/dubbo-scenario-builder/src/test/java/org/apache/dubbo/scenario/builder/VersionMatcherTest.java
b/test/dubbo-scenario-builder/src/test/java/org/apache/dubbo/scenario/builder/VersionMatcherTest.java
index c23ce27..70c8553 100644
---
a/test/dubbo-scenario-builder/src/test/java/org/apache/dubbo/scenario/builder/VersionMatcherTest.java
+++
b/test/dubbo-scenario-builder/src/test/java/org/apache/dubbo/scenario/builder/VersionMatcherTest.java
@@ -132,7 +132,7 @@ public class VersionMatcherTest {
"dubbo.version= [ '<2.7.8', \">= 2.7.9\", 3.* ]\n" +
"spring-boot.version= 2.0.8.RELEASE \n\n\n";
- String candidateVersions = "dubbo.version:2.7.8,2.7.9-SNAPSHOT,3.0.0;";
+ String candidateVersions =
"dubbo.version:2.7.8,2.7.9-SNAPSHOT,3.0.0.preview;";
candidateVersions += "spring.version:4.1.13.RELEASE,5.3.2;";
candidateVersions +=
"spring-boot.version:1.5.13.RELEASE,2.1.1.RELEASE;";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
