Skip to content
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

Fix incorrect parameter names in VersionUtils javadoc and used more appropriate names #1738

Merged
merged 2 commits into from
Sep 17, 2020
Merged

Fix incorrect parameter names in VersionUtils javadoc and used more appropriate names #1738

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
c1cef32
doc: Fix a description error in README.md of sentinel-dashboard
JieGz Sep 16, 2020
11da256
Fix incorrect parameter names in VersionUtils javadoc and used more a…
JieGz Sep 16, 2020
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
2 changes: 1 addition & 1 deletion sentinel-dashboard/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ java -Dserver.port=8080 \

| 参数 | 作用 |
|--------|--------|
|`Dcsp.sentinel.dashboard.server=localhost:8080`|向 Sentinel 接入端指定控制台的地址|
|`-Dcsp.sentinel.dashboard.server=localhost:8080`|向 Sentinel 接入端指定控制台的地址|
|`-Dproject.name=sentinel-dashboard`|向 Sentinel 指定应用名称，比如上面对应的应用名称就为 `sentinel-dashboard`|

全部的配置项可以参考 [启动配置项文档](https://github.com/alibaba/Sentinel/wiki/%E5%90%AF%E5%8A%A8%E9%85%8D%E7%BD%AE%E9%A1%B9)。
Expand Down
8 changes: 4 additions & 4 deletions sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/VersionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ public final class VersionUtils {
/**
* Parse version of Sentinel from raw string.
*
* @param versionFull version string
* @param verStr version string
* @return parsed {@link SentinelVersion} if the version is valid; empty if
* there is something wrong with the format
*/
public static Optional<SentinelVersion> parseVersion(String s) {
if (StringUtil.isBlank(s)) {
public static Optional<SentinelVersion> parseVersion(String verStr) {
if (StringUtil.isBlank(verStr)) {
return Optional.empty();
}
try {
String versionFull = s;
String versionFull = verStr;
SentinelVersion version = new SentinelVersion();

// postfix
Expand Down