From 99afeb0ec5899418eec90c2370230d03855b86c1 Mon Sep 17 00:00:00 2001 From: Zipeng WU Date: Tue, 8 Dec 2020 16:31:40 +0100 Subject: should not assign null when using Optional --- .../src/main/java/org/sonar/server/source/ws/LinesJsonWriter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'server/sonar-webserver-webapi/src') diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/LinesJsonWriter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/LinesJsonWriter.java index 64bf8ebacdf..225e6fcdd1c 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/LinesJsonWriter.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/LinesJsonWriter.java @@ -35,7 +35,7 @@ public class LinesJsonWriter { } public void writeSource(Iterable lines, JsonWriter json, Supplier> periodDateSupplier) { - Optional periodDate = null; + Long periodDate = null; json.name("sources").beginArray(); for (DbFileSources.Line line : lines) { @@ -64,9 +64,9 @@ public class LinesJsonWriter { json.prop("isNew", line.getIsNewLine()); } else { if (periodDate == null) { - periodDate = periodDateSupplier.get(); + periodDate = periodDateSupplier.get().orElse(Long.MAX_VALUE); } - json.prop("isNew", periodDate.isPresent() && line.getScmDate() > periodDate.get()); + json.prop("isNew", line.getScmDate() > periodDate); } json.endObject(); } -- cgit v1.2.3