File tree 2 files changed +12
-10
lines changed
arduino-core/src/cc/arduino/contributions
2 files changed +12
-10
lines changed Original file line number Diff line number Diff line change 32
32
import com .github .zafarkhaja .semver .Version ;
33
33
34
34
import java .io .File ;
35
+ import java .util .Optional ;
35
36
36
37
public abstract class DownloadableContribution {
37
38
@@ -66,10 +67,10 @@ public void setDownloadedFile(File downloadedFile) {
66
67
}
67
68
68
69
public String getParsedVersion () {
69
- Version version = VersionHelper .valueOf (getVersion ());
70
- if (version == null ) {
71
- return null ;
70
+ Optional < Version > version = VersionHelper .valueOf (getVersion ());
71
+ if (version . isPresent () ) {
72
+ return version . get (). toString () ;
72
73
}
73
- return version . toString () ;
74
+ return null ;
74
75
}
75
76
}
Original file line number Diff line number Diff line change 29
29
30
30
package cc .arduino .contributions ;
31
31
32
+ import java .util .Optional ;
33
+
32
34
import com .github .zafarkhaja .semver .Version ;
33
35
34
36
public class VersionHelper {
35
37
36
- public static Version valueOf (String ver ) {
38
+ public static Optional < Version > valueOf (String ver ) {
37
39
if (ver == null ) {
38
- return null ;
40
+ return Optional . empty () ;
39
41
}
40
42
try {
41
43
// Allow x.y-something, assuming x.y.0-something
@@ -49,18 +51,17 @@ public static Version valueOf(String ver) {
49
51
}
50
52
String [] parts = version .split ("\\ ." );
51
53
if (parts .length >= 3 ) {
52
- return Version .valueOf (ver );
54
+ return Optional . of ( Version .valueOf (ver ) );
53
55
}
54
56
if (parts .length == 2 ) {
55
57
version += ".0" ;
56
58
}
57
59
if (parts .length == 1 ) {
58
60
version += ".0.0" ;
59
61
}
60
- return Version .valueOf (version + extra );
62
+ return Optional . of ( Version .valueOf (version + extra ) );
61
63
} catch (Exception e ) {
62
- System .err .println ("Invalid version found: " + ver );
63
- return null ;
64
+ return Optional .empty ();
64
65
}
65
66
}
66
67
You can’t perform that action at this time.
0 commit comments