From dfd392069e823ebe5a9da023ad60d228d6627dff Mon Sep 17 00:00:00 2001 From: aboyko Date: Tue, 18 Apr 2023 16:19:06 -0400 Subject: [PATCH] Upgrade org.json dependency --- headless-services/spring-boot-language-server/pom.xml | 2 +- .../ide/vscode/boot/java/livehover/v2/Measurements.java | 6 +++--- .../boot/java/livehover/v2/RequestMappingMetrics.java | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/headless-services/spring-boot-language-server/pom.xml b/headless-services/spring-boot-language-server/pom.xml index 3c0e4a36c..e2a829a7c 100644 --- a/headless-services/spring-boot-language-server/pom.xml +++ b/headless-services/spring-boot-language-server/pom.xml @@ -134,7 +134,7 @@ org.json json - 20160810 + 20230227 diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/Measurements.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/Measurements.java index 2f64a4a24..9900e1cfb 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/Measurements.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/Measurements.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 VMware, Inc. + * Copyright (c) 2022, 2023 VMware, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,14 +13,14 @@ package org.springframework.ide.vscode.boot.java.livehover.v2; public class Measurements { private String statistic; - private Double value; + private Number value; public String getStatistic() { return statistic; } - public Double getValue() { + public Number getValue() { return value; } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/RequestMappingMetrics.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/RequestMappingMetrics.java index d60ab2b43..1a1452b1b 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/RequestMappingMetrics.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/RequestMappingMetrics.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 Pivotal, Inc. + * Copyright (c) 2020, 2023 Pivotal, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -33,20 +33,20 @@ public interface RequestMappingMetrics { @Override public double getTotalTime() { - Double d = findStatistic(measurements, "TOTAL_TIME"); + Number d = findStatistic(measurements, "TOTAL_TIME"); return d == null ? 0 : d.doubleValue(); } @Override public double getMaxTime() { - Double d = findStatistic(measurements, "MAX"); + Number d = findStatistic(measurements, "MAX"); return d == null ? 0 : d.doubleValue(); } @Override public long getCallsCount() { - Double d = findStatistic(measurements, "COUNT"); + Number d = findStatistic(measurements, "COUNT"); return d == null ? 0 : d.longValue(); }