Keep Optional.ofNullable

nicolasstucki · web-flow · commit b27332974f23 · 2019-05-28T11:10:23.000+02:00
diff --git a/sbt-bridge/src/xsbt/DelegatingReporter.java b/sbt-bridge/src/xsbt/DelegatingReporter.java
@@ -81,11 +81,11 @@ public void doReport(MessageContainer cont, Context ctx) {
       position = new Position() {
         public Optional<java.io.File> sourceFile() {
           if (src.exists()) return Optional.empty();
-          else return Optional.of(src.file().file());
+          else return Optional.ofNullable(src.file().file());
         }
         public Optional<String> sourcePath() {
           if (src.exists()) return Optional.empty();
-          else return Optional.of(src.file().path());
+          else return Optional.ofNullable(src.file().path());
         }
         public Optional<Integer> line() {
           int line = pos.line();

Original file line number	Diff line number	Diff line change
`@@ -81,11 +81,11 @@ public void doReport(MessageContainer cont, Context ctx) {`
`81`	`81`	`position = new Position() {`
`82`	`82`	`public Optional<java.io.File> sourceFile() {`
`83`	`83`	`if (src.exists()) return Optional.empty();`
`84`		`- else return Optional.of(src.file().file());`
	`84`	`+ else return Optional.ofNullable(src.file().file());`
`85`	`85`	`}`
`86`	`86`	`public Optional<String> sourcePath() {`
`87`	`87`	`if (src.exists()) return Optional.empty();`
`88`		`- else return Optional.of(src.file().path());`
	`88`	`+ else return Optional.ofNullable(src.file().path());`
`89`	`89`	`}`
`90`	`90`	`public Optional<Integer> line() {`
`91`	`91`	`int line = pos.line();`