diff --git a/web/src/main/java/com/navercorp/pinpoint/web/AuthorizationConfig.java b/web/src/main/java/com/navercorp/pinpoint/web/AuthorizationConfig.java index 09dd5d95a199..248b6769d151 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/AuthorizationConfig.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/AuthorizationConfig.java @@ -101,7 +101,7 @@ public ApplicationDataSourceController createApplicationDataSourceController(App } @Bean - public ApplicationStatController getApplicationStatControllerV2(List> list) { + public ApplicationStatController getApplicationStatControllerV2(List list) { return new ApplicationStatController(list); } diff --git a/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentStatController.java b/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentStatController.java index 9d12d5a8adbb..6c3ab4b644d0 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentStatController.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentStatController.java @@ -73,7 +73,7 @@ private Map buildDispatchMap(List list) { private T getChartService(Map map, String chartType) { T service = map.get(chartType); if (service == null) { - throw new IllegalArgumentException("chartType pathVariable not found " + chartType); + throw new IllegalArgumentException("chartType pathVariable not found chartType:" + chartType); } return service; } diff --git a/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationStatController.java b/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationStatController.java index 6bb41f20a3d0..0f8ec4ff7344 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationStatController.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationStatController.java @@ -22,17 +22,17 @@ public class ApplicationStatController { private final Logger logger = LogManager.getLogger(this.getClass()); - private final Map> chartServiceMap; + private final Map chartServiceMap; - public ApplicationStatController(List> appStatChartServiceList) { - this.chartServiceMap = build(appStatChartServiceList); + public ApplicationStatController(List statChartServiceList) { + this.chartServiceMap = build(statChartServiceList); } - private Map> build(List> appStatChartServiceList) { - ChartTypeMappingBuilder> mapping = new ChartTypeMappingBuilder<>(); - Map> map = mapping.build(appStatChartServiceList); + private Map build(List statChartServiceList) { + ChartTypeMappingBuilder mapping = new ChartTypeMappingBuilder<>(); + Map map = mapping.build(statChartServiceList); - for (Map.Entry> entry : map.entrySet()) { + for (Map.Entry entry : map.entrySet()) { logger.info("ApplicationStatChartService chartType:{} {}", entry.getKey(), entry.getValue().getClass().getSimpleName()); } return map; @@ -57,7 +57,7 @@ public StatChart getAgentStatChart(@RequestParam("applicationId") String applica private ApplicationStatChartService getService(String chartType) { ApplicationStatChartService service = this.chartServiceMap.get(chartType); if (service == null) { - throw new IllegalArgumentException("chartType not found chartType" + chartType); + throw new IllegalArgumentException("chartType pathVariable not found chartType:" + chartType); } return service; } diff --git a/web/src/main/resources/pinpoint-web-root.properties b/web/src/main/resources/pinpoint-web-root.properties index e1b9033b9abd..d1505a46f7ba 100644 --- a/web/src/main/resources/pinpoint-web-root.properties +++ b/web/src/main/resources/pinpoint-web-root.properties @@ -44,7 +44,7 @@ config.openSource=true config.show.activeThread=true config.show.activeThreadDump=true config.enable.activeThreadDump=true -config.show.applicationStat=true +config.show.applicationStat=false config.show.stackTraceOnError=true # This option does not work because it is under development