avoid nullable Rasterizer and GraphicsConfigurer parameters

nidi3 · nidi3 · commit ed367c55f7c9 · 2020-04-26T11:09:12.000+02:00
Signed-off-by: Stefan Niederhauser &lt;ghuder5@gmx.ch&gt;
diff --git a/graphviz-java/src/main/java/guru/nidi/graphviz/engine/AbstractJsGraphvizEngine.java b/graphviz-java/src/main/java/guru/nidi/graphviz/engine/AbstractJsGraphvizEngine.java
@@ -52,7 +52,7 @@ protected void doInit() {
             final JavascriptEngine engine = engine(true);
             engine.executeJavascript(vizJsCode());
             engine.executeJavascript(renderJsCode());
-            execute("graph g { a -- b }", Options.create(), null);
+            execute("graph g { a -- b }", Options.create(), Rasterizer.NONE);
         }
     }
 
@@ -93,7 +93,7 @@ public void close() {
     }
 
     @Override
-    public EngineResult execute(String src, Options options, @Nullable Rasterizer rasterizer) {
+    public EngineResult execute(String src, Options options, Rasterizer rasterizer) {
         if (rasterizer instanceof BuiltInRasterizer) {
             throw new GraphvizException("Built-in Rasterizer can only be used together with GraphvizCmdLineEngine.");
         }
diff --git a/graphviz-java/src/main/java/guru/nidi/graphviz/engine/BatikRasterizer.java b/graphviz-java/src/main/java/guru/nidi/graphviz/engine/BatikRasterizer.java
@@ -27,7 +27,7 @@
 
 class BatikRasterizer extends SvgRasterizer {
     @Override
-    public BufferedImage doRasterize(Graphviz graphviz, @Nullable Consumer<Graphics2D> graphicsConfigurer, String svg) {
+    public BufferedImage doRasterize(Graphviz graphviz, Consumer<Graphics2D> graphicsConfigurer, String svg) {
         final BufferedImage[] image = new BufferedImage[1];
         final TranscoderInput in = new TranscoderInput(new StringReader(svg));
         try {
diff --git a/graphviz-java/src/main/java/guru/nidi/graphviz/engine/BuiltInRasterizer.java b/graphviz-java/src/main/java/guru/nidi/graphviz/engine/BuiltInRasterizer.java
@@ -39,7 +39,8 @@ public Format format() {
     }
 
     @Override
-    public BufferedImage rasterize(Graphviz graphviz, @Nullable Consumer<Graphics2D> graphicsConfigurer, String input) {
+    @SuppressWarnings("ConstantConditions")
+    public BufferedImage rasterize(Graphviz graphviz, Consumer<Graphics2D> graphicsConfigurer, String input) {
         return null;
     }
 }
diff --git a/graphviz-java/src/main/java/guru/nidi/graphviz/engine/Graphviz.java b/graphviz-java/src/main/java/guru/nidi/graphviz/engine/Graphviz.java
@@ -32,6 +32,7 @@
 import static guru.nidi.graphviz.attribute.validate.ValidatorFormat.UNKNOWN_FORMAT;
 import static guru.nidi.graphviz.attribute.validate.ValidatorMessage.POSITION_LOGGING_CONSUMER;
 import static guru.nidi.graphviz.engine.GraphvizLoader.readAsString;
+import static guru.nidi.graphviz.engine.Rasterizer.NONE;
 import static java.lang.Double.parseDouble;
 import static java.util.Arrays.asList;
 import static java.util.regex.Pattern.CASE_INSENSITIVE;
@@ -52,7 +53,6 @@ public final class Graphviz {
     @Nullable
     private final String src;
 
-    @Nullable
     final Rasterizer rasterizer;
     final ProcessOptions processOptions;
     private final Options options;
@@ -64,7 +64,7 @@ private Graphviz(@Nullable MutableGraph graph, @Nullable String src, ProcessOpti
                 new ArrayList<>(), POSITION_LOGGING_CONSUMER);
     }
 
-    private Graphviz(@Nullable MutableGraph graph, @Nullable String src, @Nullable Rasterizer rasterizer,
+    private Graphviz(@Nullable MutableGraph graph, @Nullable String src, Rasterizer rasterizer,
                      ProcessOptions processOptions, Options options,
                      List<GraphvizFilter> filters, Consumer<ValidatorMessage> messageConsumer) {
         this.graph = graph;
@@ -238,22 +238,21 @@ public Graphviz messageConsumer(Consumer<ValidatorMessage> messageConsumer) {
         return new Graphviz(graph, src, rasterizer, processOptions, options, filters, messageConsumer);
     }
 
-    // TODO avoid nullable
-    public Renderer rasterize(@Nullable Rasterizer rasterizer) {
-        if (rasterizer == null) {
+    public Renderer rasterize(Rasterizer rasterizer) {
+        if (rasterizer == NONE) {
             throw new IllegalArgumentException("The provided rasterizer implementation was not found."
                     + " Make sure that either 'guru.nidi.com.kitfox:svgSalamander' or"
                     + " 'org.apache.xmlgraphics:batik-rasterizer' is available on the classpath.");
         }
         final Options opts = options.format(rasterizer.format());
         final Graphviz graphviz = new Graphviz(graph, src, rasterizer, processOptions, opts, filters, messageConsumer);
-        return new Renderer(graphviz, null, Format.PNG);
+        return new Renderer(graphviz, Format.PNG);
     }
 
     public Renderer render(Format format) {
         final Options opts = options.format(format);
         final Graphviz g = new Graphviz(graph, src, rasterizer, processOptions, opts, filters, messageConsumer);
-        return new Renderer(g, null, format);
+        return new Renderer(g, format);
     }
 
     EngineResult execute() {
@@ -297,7 +296,7 @@ public void init(Consumer<GraphvizEngine> onOk, Consumer<GraphvizEngine> onError
         }
 
         @Override
-        public EngineResult execute(String src, Options options, @Nullable Rasterizer rasterizer) {
+        public EngineResult execute(String src, Options options, Rasterizer rasterizer) {
             return EngineResult.fromString("");
         }
 
diff --git a/graphviz-java/src/main/java/guru/nidi/graphviz/engine/GraphvizCmdLineEngine.java b/graphviz-java/src/main/java/guru/nidi/graphviz/engine/GraphvizCmdLineEngine.java
@@ -80,7 +80,7 @@ protected void doInit() {
     }
 
     @Override
-    public EngineResult execute(String src, Options options, @Nullable Rasterizer rasterizer) {
+    public EngineResult execute(String src, Options options, Rasterizer rasterizer) {
         try {
             final Path path = Files.createTempDirectory(getOrCreateTempDirectory().toPath(), "DotEngine");
             final File dotFile = getDotFile(path);
@@ -94,7 +94,7 @@ public EngineResult execute(String src, Options options, @Nullable Rasterizer ra
         }
     }
 
-    private EngineResult doExecute(Path path, File dotFile, Options options, @Nullable Rasterizer rasterizer)
+    private EngineResult doExecute(Path path, File dotFile, Options options, Rasterizer rasterizer)
             throws IOException, InterruptedException {
         final String engine = getEngineExecutable(options.engine);
         final String format = getFormatName(options.format, rasterizer);
@@ -129,7 +129,7 @@ private String getEngineExecutable(@Nullable Engine engine) {
         throw e;
     }
 
-    private String getFormatName(@Nullable Format format, @Nullable Rasterizer rasterizer) {
+    private String getFormatName(@Nullable Format format, Rasterizer rasterizer) {
         if (rasterizer instanceof BuiltInRasterizer) {
             final BuiltInRasterizer natRast = (BuiltInRasterizer) rasterizer;
             String f = natRast.format;
diff --git a/graphviz-java/src/main/java/guru/nidi/graphviz/engine/GraphvizEngine.java b/graphviz-java/src/main/java/guru/nidi/graphviz/engine/GraphvizEngine.java
@@ -25,5 +25,5 @@
 public interface GraphvizEngine extends AutoCloseable {
     void init(Consumer<GraphvizEngine> onOk, Consumer<GraphvizEngine> onError);
 
-    EngineResult execute(String src, Options options, @Nullable Rasterizer rasterizer);
+    EngineResult execute(String src, Options options, Rasterizer rasterizer);
 }
diff --git a/graphviz-java/src/main/java/guru/nidi/graphviz/engine/GraphvizServerEngine.java b/graphviz-java/src/main/java/guru/nidi/graphviz/engine/GraphvizServerEngine.java
@@ -53,7 +53,7 @@ public GraphvizServerEngine timeout(int amount, TimeUnit unit) {
     }
 
     @Override
-    public EngineResult execute(String src, Options options, @Nullable Rasterizer rasterizer) {
+    public EngineResult execute(String src, Options options, Rasterizer rasterizer) {
         try {
             return EngineResult.fromString(createSvg(src, options));
         } catch (SocketTimeoutException e) {
diff --git a/graphviz-java/src/main/java/guru/nidi/graphviz/engine/NopRasterizer.java b/graphviz-java/src/main/java/guru/nidi/graphviz/engine/NopRasterizer.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2015 Stefan Niederhauser (nidin@gmx.ch)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package guru.nidi.graphviz.engine;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.util.function.Consumer;
+
+@SuppressWarnings("ConstantConditions")
+class NopRasterizer implements Rasterizer {
+    @Override
+    public Format format() {
+        return null;
+    }
+
+    @Override
+    public BufferedImage rasterize(Graphviz graphviz, Consumer<Graphics2D> graphicsConfigurer, String input) {
+        return null;
+    }
+}
diff --git a/graphviz-java/src/main/java/guru/nidi/graphviz/engine/Rasterizer.java b/graphviz-java/src/main/java/guru/nidi/graphviz/engine/Rasterizer.java
@@ -17,25 +17,21 @@
 
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.util.function.Consumer;
 
 import static guru.nidi.graphviz.engine.GraphvizLoader.isOnClasspath;
 
 public interface Rasterizer {
-    @Nullable
-    Rasterizer BATIK = isOnClasspath("org/apache/batik/transcoder/Transcoder.class") ? new BatikRasterizer() : null;
-    @Nullable
-    Rasterizer SALAMANDER = isOnClasspath("com/kitfox/svg/SVGDiagram.class") ? new SalamanderRasterizer() : null;
-    @Nullable
+    Rasterizer NONE = new NopRasterizer();
+    Rasterizer BATIK = isOnClasspath("org/apache/batik/transcoder/Transcoder.class") ? new BatikRasterizer() : NONE;
+    Rasterizer SALAMANDER = isOnClasspath("com/kitfox/svg/SVGDiagram.class") ? new SalamanderRasterizer() : NONE;
     Rasterizer DEFAULT = getDefault();
 
-    @Nullable
     static Rasterizer getDefault() {
-        final Rasterizer r = BATIK != null ? BATIK : SALAMANDER;
-        if (r == null) {
+        final Rasterizer r = BATIK != NONE ? BATIK : SALAMANDER;
+        if (r == NONE) {
             LoggerFactory.getLogger(Rasterizer.class).warn("Neither Batik nor Salamander found on classpath");
         }
         return r;
@@ -55,5 +51,5 @@ static Rasterizer builtIn(String format, String renderer, String formatter) {
 
     Format format();
 
-    BufferedImage rasterize(Graphviz graphviz, @Nullable Consumer<Graphics2D> graphicsConfigurer, String input);
+    BufferedImage rasterize(Graphviz graphviz, Consumer<Graphics2D> graphicsConfigurer, String input);
 }
diff --git a/graphviz-java/src/main/java/guru/nidi/graphviz/engine/Renderer.java b/graphviz-java/src/main/java/guru/nidi/graphviz/engine/Renderer.java
@@ -15,7 +15,6 @@
  */
 package guru.nidi.graphviz.engine;
 
-import javax.annotation.Nullable;
 import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
@@ -24,16 +23,22 @@
 import java.nio.file.StandardCopyOption;
 import java.util.function.Consumer;
 
+import static guru.nidi.graphviz.engine.Rasterizer.NONE;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Locale.ENGLISH;
 
 public class Renderer {
+    private static final Consumer<Graphics2D> NOP_GRAPHICS_CONFIGURER = Graphics2D -> {
+    };
     private final Graphviz graphviz;
-    @Nullable
     private final Consumer<Graphics2D> graphicsConfigurer;
     private final Format output;
 
-    Renderer(Graphviz graphviz, @Nullable Consumer<Graphics2D> graphicsConfigurer, Format output) {
+    Renderer(Graphviz graphviz, Format output) {
+        this(graphviz, NOP_GRAPHICS_CONFIGURER, output);
+    }
+
+    Renderer(Graphviz graphviz, Consumer<Graphics2D> graphicsConfigurer, Format output) {
         this.graphviz = graphviz;
         this.graphicsConfigurer = graphicsConfigurer;
         this.output = output;
@@ -110,7 +115,7 @@ private BufferedImage toImage(EngineResult result) {
     }
 
     private BufferedImage toImage(String content) {
-        if (graphviz.rasterizer == null) {
+        if (graphviz.rasterizer == NONE) {
             throw new IllegalStateException("- Rasterizer explicitly set no null or\n"
                     + "- neither 'guru.nidi.com.kitfox:svgSalamander' nor 'org.apache.xmlgraphics:batik-rasterizer'"
                     + " found on classpath.");
diff --git a/graphviz-java/src/main/java/guru/nidi/graphviz/engine/SalamanderRasterizer.java b/graphviz-java/src/main/java/guru/nidi/graphviz/engine/SalamanderRasterizer.java
@@ -17,7 +17,6 @@
 
 import com.kitfox.svg.*;
 
-import javax.annotation.Nullable;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.StringReader;
@@ -28,15 +27,13 @@
 
 class SalamanderRasterizer extends SvgRasterizer {
     @Override
-    public BufferedImage doRasterize(Graphviz graphviz, @Nullable Consumer<Graphics2D> graphicsConfigurer, String svg) {
+    public BufferedImage doRasterize(Graphviz graphviz, Consumer<Graphics2D> graphicsConfigurer, String svg) {
         final SVGDiagram diagram = createDiagram(svg);
         final BufferedImage image = new BufferedImage(
                 (int) diagram.getWidth(), (int) diagram.getHeight(), BufferedImage.TYPE_INT_ARGB);
         final Graphics2D graphics = image.createGraphics();
         configGraphics(graphics);
-        if (graphicsConfigurer != null) {
-            graphicsConfigurer.accept(graphics);
-        }
+        graphicsConfigurer.accept(graphics);
         renderDiagram(diagram, graphics);
         return image;
     }
diff --git a/graphviz-java/src/main/java/guru/nidi/graphviz/engine/SvgRasterizer.java b/graphviz-java/src/main/java/guru/nidi/graphviz/engine/SvgRasterizer.java
@@ -27,7 +27,7 @@ public Format format() {
     }
 
     @Override
-    public BufferedImage rasterize(Graphviz graphviz, @Nullable Consumer<Graphics2D> graphicsConfigurer, String input) {
+    public BufferedImage rasterize(Graphviz graphviz, Consumer<Graphics2D> graphicsConfigurer, String input) {
         final String svg = input
                 .replace("xlink:href=\"", "xlink:href=\"file://")
                 .replace("stroke=\"transparent\"", "stroke=\"#fff\" stroke-opacity=\"0.0\"")
@@ -37,7 +37,5 @@ public BufferedImage rasterize(Graphviz graphviz, @Nullable Consumer<Graphics2D>
         return doRasterize(graphviz, graphicsConfigurer, svg);
     }
 
-    abstract BufferedImage doRasterize(Graphviz graphviz,
-                                       @Nullable Consumer<Graphics2D> graphicsConfigurer,
-                                       String svg);
+    abstract BufferedImage doRasterize(Graphviz graphviz, Consumer<Graphics2D> graphicsConfigurer, String svg);
 }
diff --git a/graphviz-java/src/main/java/guru/nidi/graphviz/model/PortSource.java b/graphviz-java/src/main/java/guru/nidi/graphviz/model/PortSource.java
@@ -19,6 +19,7 @@
 
 import java.util.List;
 
+@SuppressWarnings("ConstantConditions")
 class PortSource implements LinkSource {
     final Port port;
 
diff --git a/graphviz-java/src/test/java/guru/nidi/graphviz/CodeAnalysisTest.java b/graphviz-java/src/test/java/guru/nidi/graphviz/CodeAnalysisTest.java
@@ -76,12 +76,11 @@ protected FindBugsResult analyzeFindBugs() {
                                 .ignore("UNENCRYPTED_SERVER_SOCKET", "UNENCRYPTED_SOCKET"))
                 .because("It's ok",
                         In.loc("Datatype").ignore("NP_BOOLEAN_RETURN_NULL"),
-                        In.loc("BuiltInRasterizer").ignore("NP_NONNULL_RETURN_VIOLATION"),
+                        In.locs("BuiltInRasterizer#rasterize","NopRasterizer","PortSource").ignore("NP_NONNULL_RETURN_VIOLATION"),
                         In.loc("CommandLineExecutor").ignore("DM_DEFAULT_ENCODING"),
                         In.loc("GraphvizServer").ignore("COMMAND_INJECTION", "CRLF_INJECTION_LOGS"),
                         In.locs("AbstractGraphvizEngine", "Options", "GraphvizCmdLineEngine", "EngineTest", "SystemUtils", "Renderer").ignore("PATH_TRAVERSAL_IN"),
                         In.locs("EngineTest", "RendererTest", "EngineResult").ignore("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE"),
-                        In.loc("PortSource").ignore("NP_NONNULL_RETURN_VIOLATION"),
                         In.loc("OptionsTest").ignore("DMI_HARDCODED_ABSOLUTE_FILENAME"),
                         In.loc("SimpleLabel").ignore("IM_BAD_CHECK_FOR_ODD"),
                         In.loc("JavascriptEngineTest").ignore("PREDICTABLE_RANDOM"),
@@ -103,6 +102,7 @@ protected PmdResult analyzePmd() {
                 .because("There are a lot of colors", In.clazz(Color.class)
                         .ignore("FieldDeclarationsShouldBeAtStartOfClass"))
                 .because("it's ok here",
+                        In.loc("Rasterizer#getDefault").ignore("CompareObjectsWithEquals"),
                         In.locs("Format", "AttributeConfigs").ignore("AvoidDuplicateLiterals"),
                         In.locs("LabelTest", "RankTest", "AttributeValidatorTest", "ParserTest", "JavascriptEngineTest", "ArrowDatatypeTest", "ColorListDatatypeTest", "ShapeDatatypeTest")
                                 .ignore("JUnitTestContainsTooManyAsserts"),
diff --git a/graphviz-java/src/test/java/guru/nidi/graphviz/engine/SvgRasterizerTest.java b/graphviz-java/src/test/java/guru/nidi/graphviz/engine/SvgRasterizerTest.java
@@ -17,7 +17,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import javax.annotation.Nullable;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.util.function.Consumer;
@@ -28,7 +27,8 @@ class SvgRasterizerTest {
     @Test
     void preProcess() {
         final DummyRasterizer rasterizer = new DummyRasterizer();
-        rasterizer.rasterize(Graphviz.fromString(""), null, quote(
+        rasterizer.rasterize(Graphviz.fromString(""), Graphics2D -> {
+        }, quote(
                 "<svg width='62px' height='116px' viewBox='0.00 0.00 62.00 116.00'>" +
                         "<g id='graph0' class='graph' transform=' rotate(0) translate(4 112)'>\n" +
                         "<text xlink:href='ref' stroke='transparent'>a</text>\n" +
@@ -51,7 +51,7 @@ private static class DummyRasterizer extends SvgRasterizer {
         String svg = "";
 
         @Override
-        BufferedImage doRasterize(Graphviz graphviz, @Nullable Consumer<Graphics2D> graphicsConfigurer, String svg) {
+        BufferedImage doRasterize(Graphviz graphviz, Consumer<Graphics2D> graphicsConfigurer, String svg) {
             this.svg = svg;
             return new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
         }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ protected void doInit() {`
`52`	`52`	`final JavascriptEngine engine = engine(true);`
`53`	`53`	`engine.executeJavascript(vizJsCode());`
`54`	`54`	`engine.executeJavascript(renderJsCode());`
`55`		`- execute("graph g { a -- b }", Options.create(), null);`
	`55`	`+ execute("graph g { a -- b }", Options.create(), Rasterizer.NONE);`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`@@ -93,7 +93,7 @@ public void close() {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`@Override`
`96`		`- public EngineResult execute(String src, Options options, @Nullable Rasterizer rasterizer) {`
	`96`	`+ public EngineResult execute(String src, Options options, Rasterizer rasterizer) {`
`97`	`97`	`if (rasterizer instanceof BuiltInRasterizer) {`
`98`	`98`	`throw new GraphvizException("Built-in Rasterizer can only be used together with GraphvizCmdLineEngine.");`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ public Format format() {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Override`
`42`		`- public BufferedImage rasterize(Graphviz graphviz, @Nullable Consumer<Graphics2D> graphicsConfigurer, String input) {`
	`42`	`+ @SuppressWarnings("ConstantConditions")`
	`43`	`+ public BufferedImage rasterize(Graphviz graphviz, Consumer<Graphics2D> graphicsConfigurer, String input) {`
`43`	`44`	`return null;`
`44`	`45`	`}`
`45`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ protected void doInit() {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`@Override`
`83`		`- public EngineResult execute(String src, Options options, @Nullable Rasterizer rasterizer) {`
	`83`	`+ public EngineResult execute(String src, Options options, Rasterizer rasterizer) {`
`84`	`84`	`try {`
`85`	`85`	`final Path path = Files.createTempDirectory(getOrCreateTempDirectory().toPath(), "DotEngine");`
`86`	`86`	`final File dotFile = getDotFile(path);`
`@@ -94,7 +94,7 @@ public EngineResult execute(String src, Options options, @Nullable Rasterizer ra`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`97`		`- private EngineResult doExecute(Path path, File dotFile, Options options, @Nullable Rasterizer rasterizer)`
	`97`	`+ private EngineResult doExecute(Path path, File dotFile, Options options, Rasterizer rasterizer)`
`98`	`98`	`throws IOException, InterruptedException {`
`99`	`99`	`final String engine = getEngineExecutable(options.engine);`
`100`	`100`	`final String format = getFormatName(options.format, rasterizer);`
`@@ -129,7 +129,7 @@ private String getEngineExecutable(@Nullable Engine engine) {`
`129`	`129`	`throw e;`
`130`	`130`	`}`
`131`	`131`
`132`		`- private String getFormatName(@Nullable Format format, @Nullable Rasterizer rasterizer) {`
	`132`	`+ private String getFormatName(@Nullable Format format, Rasterizer rasterizer) {`
`133`	`133`	`if (rasterizer instanceof BuiltInRasterizer) {`
`134`	`134`	`final BuiltInRasterizer natRast = (BuiltInRasterizer) rasterizer;`
`135`	`135`	`String f = natRast.format;`
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,5 @@`
`25`	`25`	`public interface GraphvizEngine extends AutoCloseable {`
`26`	`26`	`void init(Consumer<GraphvizEngine> onOk, Consumer<GraphvizEngine> onError);`
`27`	`27`
`28`		`- EngineResult execute(String src, Options options, @Nullable Rasterizer rasterizer);`
	`28`	`+ EngineResult execute(String src, Options options, Rasterizer rasterizer);`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public GraphvizServerEngine timeout(int amount, TimeUnit unit) {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
`56`		`- public EngineResult execute(String src, Options options, @Nullable Rasterizer rasterizer) {`
	`56`	`+ public EngineResult execute(String src, Options options, Rasterizer rasterizer) {`
`57`	`57`	`try {`
`58`	`58`	`return EngineResult.fromString(createSvg(src, options));`
`59`	`59`	`} catch (SocketTimeoutException e) {`