Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed NPE in metrics parsing and bug in setting code lens content

Browse Source
This commit is contained in:
Nieraj Singh
2020-11-12 15:04:31 -08:00
committed by BoykoAlex
parent 6265174250
commit 80d6ade0dc
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessLiveDataExtractorOverJMX.java
View File

@@ -148,13 +148,13 @@ public class SpringProcessLiveDataExtractorOverJMX {
if (metricsData instanceof String) {
return RequestMappingMetrics.parse((String) metricsData);
} else {
} else if (metricsData != null) {
return RequestMappingMetrics.parse(gson.toJson(metricsData));
}
} catch (Exception e) {
log.error("", e);
return null;
}
return null;
}
};
}

13
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java
View File

@@ -321,11 +321,11 @@ public class RequestMappingHoverProvider implements HoverProvider {
if (StringUtil.hasText(content)) {
codeLens.setData(content);
StringBuilder codeLenseContent = new StringBuilder(content);
if (metrics != null) {
char timeUnitShort = metrics.getTimeUnit().name().charAt(0);
StringBuilder codeLenseContent = new StringBuilder(content);
codeLenseContent.append('(');
codeLenseContent.append("Count=");
codeLenseContent.append(metrics.getCallsCount());
@@ -338,9 +338,12 @@ public class RequestMappingHoverProvider implements HoverProvider {
codeLenseContent.append(metrics.getMaxTime());
codeLenseContent.append(timeUnitShort);
codeLenseContent.append(')');
}
cmd.setTitle(codeLenseContent.toString());
content = codeLenseContent.toString();
}
codeLens.setData(content);
cmd.setTitle(content);
cmd.setCommand("sts.open.url");
cmd.setArguments(ImmutableList.of(content));
}