should not assign null when using Optional

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 64bf8ebacdfd9c206092bc1c5571f24ab6f8fd22..225e6fcdd1ca1bde830c1a7efe03a7503f84e7c3 100644 (file)
--- 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<DbFileSources.Line> lines, JsonWriter json, Supplier<Optional<Long>> periodDateSupplier) {
-    Optional<Long> 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();
     }