Skip to content

Commit dd025dc

Browse files
stefan-kastefan-ka
committed
Remove javax.annotations dependency as it causes so much pain in Eclipse
1 parent cf466ea commit dd025dc

36 files changed

+63
-148
lines changed

‎build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ dependencies {
3737
implementation "org.apache.commons:commons-lang3:${commonsLangVersion}"
3838
implementation "guru.nidi.com.kitfox:svgSalamander:1.1.2"
3939
implementation "org.apache.commons:commons-exec:1.3"
40-
implementation "com.google.code.findbugs:jsr305:3.0.2"
4140
implementation "org.slf4j:slf4j-api:1.7.26"
4241

4342
testImplementation "org.junit.jupiter:junit-jupiter-api:${jUnitVersion}"

‎src/main/java/guru/nidi/graphviz/NonnullApi.java

-4
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,9 @@
1515
*/
1616
package guru.nidi.graphviz;
1717

18-
import javax.annotation.Nonnull;
19-
import javax.annotation.meta.TypeQualifierDefault;
2018
import java.lang.annotation.*;
2119

2220
@Documented
23-
@Nonnull
24-
@TypeQualifierDefault({ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD})
2521
@Retention(RetentionPolicy.CLASS)
2622
@Target(ElementType.PACKAGE)
2723
public @interface NonnullApi {

‎src/main/java/guru/nidi/graphviz/attribute/Arrow.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package guru.nidi.graphviz.attribute;
1717

18-
import javax.annotation.Nullable;
19-
2018
import static guru.nidi.graphviz.attribute.Attributes.attr;
2119
import static guru.nidi.graphviz.attribute.Attributes.attrs;
2220
import static java.util.Locale.ENGLISH;
@@ -75,7 +73,7 @@ public Attributes<ForLink> dir(DirType type) {
7573
return config(0, type);
7674
}
7775

78-
public Attributes<ForLink> config(double size, @Nullable DirType type) {
76+
public Attributes<ForLink> config(double size, DirType type) {
7977
Attributes<ForLink> a = this;
8078
if (size > 0) {
8179
a = attrs(a, attr("arrowsize", size));

‎src/main/java/guru/nidi/graphviz/attribute/Attributed.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
*/
1616
package guru.nidi.graphviz.attribute;
1717

18-
import javax.annotation.Nullable;
1918
import java.util.List;
2019

2120
import static guru.nidi.graphviz.attribute.Attributes.attr;
2221
import static guru.nidi.graphviz.attribute.Attributes.attrs;
2322

2423
public interface Attributed<T, F extends For> extends Attributes<F> {
25-
default T with(String name, @Nullable Object value) {
24+
default T with(String name, Object value) {
2625
return with(attr(name, value));
2726
}
2827

‎src/main/java/guru/nidi/graphviz/attribute/Attributes.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package guru.nidi.graphviz.attribute;
1717

18-
import javax.annotation.Nullable;
1918
import java.util.Iterator;
2019
import java.util.List;
2120
import java.util.Map.Entry;
@@ -38,7 +37,7 @@ default Attributes<F> copy() {
3837
return copy;
3938
}
4039

41-
static <F extends For> Attributes<F> attr(String key, @Nullable Object value) {
40+
static <F extends For> Attributes<F> attr(String key,Object value) {
4241
return new MapAttributes<F>().add(key, value);
4342
}
4443

@@ -59,7 +58,6 @@ static <F extends For> Attributes<F> attrs(List<Attributes<? extends F>> attribu
5958
return res;
6059
}
6160

62-
@Nullable
6361
default Object get(String key) {
6462
return applyTo(new MapAttributes<>()).get(key);
6563
}

‎src/main/java/guru/nidi/graphviz/attribute/EndLabel.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,25 @@
1515
*/
1616
package guru.nidi.graphviz.attribute;
1717

18-
import javax.annotation.Nullable;
1918
import java.util.Objects;
2019

2120
public final class EndLabel extends SimpleLabel implements Attributes<ForLink> {
2221
private final String key;
23-
@Nullable
2422
private final Double angle;
25-
@Nullable
2623
private final Double distance;
2724

28-
private EndLabel(String key, String value, boolean html, @Nullable Double angle, @Nullable Double distance) {
25+
private EndLabel(String key, String value, boolean html, Double angle, Double distance) {
2926
super(value, html);
3027
this.key = key;
3128
this.angle = angle;
3229
this.distance = distance;
3330
}
3431

35-
public static EndLabel head(SimpleLabel label, @Nullable Double angle, @Nullable Double distance) {
32+
public static EndLabel head(SimpleLabel label, Double angle, Double distance) {
3633
return new EndLabel("headlabel", label.value, label.html, angle, distance);
3734
}
3835

39-
public static EndLabel tail(SimpleLabel label, @Nullable Double angle, @Nullable Double distance) {
36+
public static EndLabel tail(SimpleLabel label, Double angle, Double distance) {
4037
return new EndLabel("taillabel", label.value, label.html, angle, distance);
4138
}
4239

‎src/main/java/guru/nidi/graphviz/attribute/Label.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package guru.nidi.graphviz.attribute;
1717

18-
import javax.annotation.Nullable;
1918
import java.util.Objects;
2019
import java.util.stream.Stream;
2120

@@ -36,13 +35,11 @@ public enum Location {
3635
private final boolean external;
3736
private final boolean floating;
3837
private final boolean decorated;
39-
@Nullable
4038
private final Justification just;
41-
@Nullable
4239
private final Location loc;
4340

4441
private Label(String value, boolean html, boolean external, boolean floating, boolean decorated,
45-
@Nullable Justification just, @Nullable Location loc) {
42+
Justification just, Location loc) {
4643
super(value, html);
4744
this.external = external;
4845
this.floating = floating;

‎src/main/java/guru/nidi/graphviz/attribute/MapAttributes.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package guru.nidi.graphviz.attribute;
1717

18-
import javax.annotation.Nullable;
1918
import java.util.*;
2019
import java.util.Map.Entry;
2120

@@ -31,7 +30,7 @@ public Attributes<? super F> applyTo(MapAttributes<? super F> attrs) {
3130
return attrs;
3231
}
3332

34-
public <G extends For> MapAttributes<G> add(String key, @Nullable Object value) {
33+
public <G extends For> MapAttributes<G> add(String key, Object value) {
3534
if (value == null) {
3635
attributes.remove(key);
3736
} else {

‎src/main/java/guru/nidi/graphviz/attribute/Rank.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package guru.nidi.graphviz.attribute;
1717

18-
import javax.annotation.Nullable;
19-
2018
public final class Rank {
2119
private Rank() {
2220
}
@@ -48,15 +46,13 @@ private static class SubgraphRank extends SingleAttributes<String, ForGraph> {
4846
}
4947

5048
public static class GraphRank implements Attributes<ForGraph> {
51-
@Nullable
5249
private final RankDir dir;
53-
@Nullable
5450
private final Double sep;
5551
private final boolean equally;
5652
private final boolean cluster;
5753
private final boolean newRank;
5854

59-
GraphRank(@Nullable RankDir dir, @Nullable Double sep, boolean equally,
55+
GraphRank(RankDir dir, Double sep, boolean equally,
6056
boolean cluster, boolean newRank) {
6157
this.dir = dir;
6258
this.sep = sep;

‎src/main/java/guru/nidi/graphviz/attribute/Shape.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package guru.nidi.graphviz.attribute;
1717

18-
import javax.annotation.Nullable;
19-
2018
import static guru.nidi.graphviz.attribute.Attributes.attr;
2119
import static guru.nidi.graphviz.attribute.Attributes.attrs;
2220
import static guru.nidi.graphviz.attribute.NodeAttr.nodeAttr;
@@ -69,14 +67,11 @@ public static Polygon polygon(int sides) {
6967

7068
public static class Polygon implements Attributes<ForNode> {
7169
private final int sides;
72-
@Nullable
7370
private final Double skew;
74-
@Nullable
7571
private final Double distortion;
76-
@Nullable
7772
private final Double rotation;
7873

79-
Polygon(int sides, @Nullable Double skew, @Nullable Double distortion, @Nullable Double rotation) {
74+
Polygon(int sides, Double skew, Double distortion, Double rotation) {
8075
this.sides = sides;
8176
this.skew = skew;
8277
this.distortion = distortion;

‎src/main/java/guru/nidi/graphviz/attribute/Size.java

+2-9
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package guru.nidi.graphviz.attribute;
1717

18-
import javax.annotation.Nullable;
19-
2018
import static guru.nidi.graphviz.attribute.NodeAttr.nodeAttr;
2119

2220
public final class Size implements Attributes<ForNode> {
@@ -30,19 +28,14 @@ public enum Mode {
3028
}
3129
}
3230

33-
@Nullable
3431
private final Mode mode;
35-
@Nullable
3632
private final Double width;
37-
@Nullable
3833
private final Double height;
39-
@Nullable
4034
private final Double marginX;
41-
@Nullable
4235
private final Double marginY;
4336

44-
private Size(@Nullable Mode mode, @Nullable Double width, @Nullable Double height,
45-
@Nullable Double marginX, @Nullable Double marginY) {
37+
private Size(Mode mode, Double width, Double height,
38+
Double marginX, Double marginY) {
4639
this.mode = mode;
4740
this.width = width;
4841
this.height = height;

‎src/main/java/guru/nidi/graphviz/engine/AbstractJsGraphvizEngine.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import guru.nidi.graphviz.service.SystemUtils;
1919

20-
import javax.annotation.Nullable;
2120
import java.io.IOException;
2221
import java.io.InputStream;
2322
import java.util.AbstractMap.SimpleEntry;
@@ -31,7 +30,7 @@ public AbstractJsGraphvizEngine(boolean sync) {
3130
}
3231

3332
@Override
34-
public EngineResult execute(String src, Options options, @Nullable Rasterizer rasterizer) {
33+
public EngineResult execute(String src, Options options, Rasterizer rasterizer) {
3534
if (rasterizer instanceof BuiltInRasterizer) {
3635
throw new GraphvizException("Built-in Rasterizer can only be used together with GraphvizCmdLineEngine.");
3736
}

‎src/main/java/guru/nidi/graphviz/engine/BuiltInRasterizer.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,16 @@
1515
*/
1616
package guru.nidi.graphviz.engine;
1717

18-
import javax.annotation.Nullable;
1918
import java.awt.*;
2019
import java.awt.image.BufferedImage;
2120
import java.util.function.Consumer;
2221

2322
class BuiltInRasterizer implements Rasterizer {
2423
final String format;
25-
@Nullable
2624
final String renderer;
27-
@Nullable
2825
final String formatter;
2926

30-
BuiltInRasterizer(String format, @Nullable String renderer, @Nullable String formatter) {
27+
BuiltInRasterizer(String format, String renderer, String formatter) {
3128
this.format = format;
3229
this.renderer = renderer;
3330
this.formatter = formatter;
@@ -39,7 +36,7 @@ public Format format() {
3936
}
4037

4138
@Override
42-
public BufferedImage rasterize(Graphviz graphviz, @Nullable Consumer<Graphics2D> graphicsConfigurer, String input) {
39+
public BufferedImage rasterize(Graphviz graphviz, Consumer<Graphics2D> graphicsConfigurer, String input) {
4340
return null;
4441
}
4542
}

‎src/main/java/guru/nidi/graphviz/engine/EngineResult.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,17 @@
1515
*/
1616
package guru.nidi.graphviz.engine;
1717

18-
import javax.annotation.Nullable;
1918
import java.io.File;
2019
import java.io.IOException;
2120
import java.util.Objects;
2221
import java.util.function.Consumer;
2322
import java.util.function.Function;
2423

2524
public final class EngineResult {
26-
@Nullable
2725
private final File file;
28-
@Nullable
2926
private final String string;
3027

31-
private EngineResult(@Nullable File file, @Nullable String string) {
28+
private EngineResult(File file, String string) {
3229
this.file = file;
3330
this.string = string;
3431
}

‎src/main/java/guru/nidi/graphviz/engine/Graphviz.java

+4-8
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import guru.nidi.graphviz.model.Graph;
1919
import guru.nidi.graphviz.model.MutableGraph;
2020

21-
import javax.annotation.Nullable;
2221
import java.io.*;
2322
import java.util.*;
2423
import java.util.concurrent.*;
@@ -32,20 +31,17 @@ public final class Graphviz {
3231
private static final Pattern DPI_PATTERN = Pattern.compile("\"?dpi\"?\\s*=\\s*\"?([0-9.]+)\"?",
3332
Pattern.CASE_INSENSITIVE);
3433

35-
@Nullable
3634
private static volatile BlockingQueue<GraphvizEngine> engineQueue;
37-
@Nullable
3835
private static GraphvizEngine engine;
3936
private final String src;
4037
private final Options options;
41-
@Nullable
4238
final Rasterizer rasterizer;
4339
final int width;
4440
final int height;
4541
final double scale;
4642
final double fontAdjust;
4743

48-
private Graphviz(String src, @Nullable Rasterizer rasterizer,
44+
private Graphviz(String src, Rasterizer rasterizer,
4945
int width, int height, double scale, double fontAdjust, Options options) {
5046
this.src = src;
5147
this.rasterizer = rasterizer;
@@ -152,11 +148,11 @@ public Graphviz engine(Engine engine) {
152148
return new Graphviz(src, rasterizer, width, height, scale, fontAdjust, options.engine(engine));
153149
}
154150

155-
public Graphviz totalMemory(@Nullable Integer totalMemory) {
151+
public Graphviz totalMemory(Integer totalMemory) {
156152
return new Graphviz(src, rasterizer, width, height, scale, fontAdjust, options.totalMemory(totalMemory));
157153
}
158154

159-
public Graphviz yInvert(@Nullable Boolean yInvert) {
155+
public Graphviz yInvert(Boolean yInvert) {
160156
return new Graphviz(src, rasterizer, width, height, scale, fontAdjust, options.yInvert(yInvert));
161157
}
162158

@@ -180,7 +176,7 @@ public Graphviz fontAdjust(double fontAdjust) {
180176
return new Graphviz(src, rasterizer, width, height, scale, fontAdjust, options);
181177
}
182178

183-
public Renderer rasterize(@Nullable Rasterizer rasterizer) {
179+
public Renderer rasterize(Rasterizer rasterizer) {
184180
if (rasterizer == null) {
185181
throw new IllegalArgumentException("The provided rasterizer implementation was not found. "
186182
+ "Make sure that the batik-rasterizer or svg-salamander jar is available on the classpath.");

‎src/main/java/guru/nidi/graphviz/engine/GraphvizCmdLineEngine.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.slf4j.Logger;
2020
import org.slf4j.LoggerFactory;
2121

22-
import javax.annotation.Nullable;
2322
import java.io.*;
2423
import java.nio.charset.StandardCharsets;
2524
import java.nio.file.Files;
@@ -39,9 +38,7 @@ public class GraphvizCmdLineEngine extends AbstractGraphvizEngine {
3938
private final String envPath;
4039
private final CommandRunner cmdRunner;
4140

42-
@Nullable
4341
private String outputFilePath;
44-
@Nullable
4542
private String outputFileName;
4643

4744
public GraphvizCmdLineEngine() {
@@ -99,7 +96,7 @@ protected String preprocessCode(String src, Options options) {
9996
return replacePaths(imgReplaced, IMAGE_ATTR, path -> replacePath(path, options.basedir));
10097
}
10198

102-
private String getEngineExecutable(@Nullable Engine engine) {
99+
private String getEngineExecutable(Engine engine) {
103100
final String exe = SystemUtils.executableName(engine == null ? "dot" : engine.toString().toLowerCase(ENGLISH));
104101
if (!CommandRunner.isExecutableFound(exe, envPath)) {
105102
final GraphvizException e = new GraphvizException(exe + " command not found");
@@ -109,7 +106,7 @@ private String getEngineExecutable(@Nullable Engine engine) {
109106
return exe;
110107
}
111108

112-
private String getFormatName(@Nullable Format format, Rasterizer rasterizer) {
109+
private String getFormatName(Format format, Rasterizer rasterizer) {
113110
if (rasterizer instanceof BuiltInRasterizer) {
114111
final BuiltInRasterizer natRast = (BuiltInRasterizer) rasterizer;
115112
String f = natRast.format;

0 commit comments

Comments
 (0)