Remove javax.annotations dependency as it causes so much pain in Eclipse

Author: stefan-ka

build.gradle

@@ -37,7 +37,6 @@ dependencies {
     implementation "org.apache.commons:commons-lang3:${commonsLangVersion}"
     implementation "guru.nidi.com.kitfox:svgSalamander:1.1.2"
     implementation "org.apache.commons:commons-exec:1.3"
-    implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation "org.slf4j:slf4j-api:1.7.26"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:${jUnitVersion}"

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

@@ -15,13 +15,9 @@
  */
 package guru.nidi.graphviz;
 
-import javax.annotation.Nonnull;
-import javax.annotation.meta.TypeQualifierDefault;
 import java.lang.annotation.*;
 
 @Documented
-@Nonnull
-@TypeQualifierDefault({ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.PACKAGE)
 public @interface NonnullApi {

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

@@ -15,8 +15,6 @@
  */
 package guru.nidi.graphviz.attribute;
 
-import javax.annotation.Nullable;
-
 import static guru.nidi.graphviz.attribute.Attributes.attr;
 import static guru.nidi.graphviz.attribute.Attributes.attrs;
 import static java.util.Locale.ENGLISH;
@@ -75,7 +73,7 @@ public Attributes<ForLink> dir(DirType type) {
         return config(0, type);
     }
 
-    public Attributes<ForLink> config(double size, @Nullable DirType type) {
+    public Attributes<ForLink> config(double size, DirType type) {
         Attributes<ForLink> a = this;
         if (size > 0) {
             a = attrs(a, attr("arrowsize", size));

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

@@ -15,14 +15,13 @@
  */
 package guru.nidi.graphviz.attribute;
 
-import javax.annotation.Nullable;
 import java.util.List;
 
 import static guru.nidi.graphviz.attribute.Attributes.attr;
 import static guru.nidi.graphviz.attribute.Attributes.attrs;
 
 public interface Attributed<T, F extends For> extends Attributes<F> {
-    default T with(String name, @Nullable Object value) {
+    default T with(String name, Object value) {
         return with(attr(name, value));
     }
 

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

@@ -15,7 +15,6 @@
  */
 package guru.nidi.graphviz.attribute;
 
-import javax.annotation.Nullable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
@@ -38,7 +37,7 @@ default Attributes<F> copy() {
         return copy;
     }
 
-    static <F extends For> Attributes<F> attr(String key, @Nullable Object value) {
+    static <F extends For> Attributes<F> attr(String key,Object value) {
         return new MapAttributes<F>().add(key, value);
     }
 
@@ -59,7 +58,6 @@ static <F extends For> Attributes<F> attrs(List<Attributes<? extends F>> attribu
         return res;
     }
 
-    @Nullable
     default Object get(String key) {
         return applyTo(new MapAttributes<>()).get(key);
     }

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

@@ -15,28 +15,25 @@
  */
 package guru.nidi.graphviz.attribute;
 
-import javax.annotation.Nullable;
 import java.util.Objects;
 
 public final class EndLabel extends SimpleLabel implements Attributes<ForLink> {
     private final String key;
-    @Nullable
     private final Double angle;
-    @Nullable
     private final Double distance;
 
-    private EndLabel(String key, String value, boolean html, @Nullable Double angle, @Nullable Double distance) {
+    private EndLabel(String key, String value, boolean html, Double angle, Double distance) {
         super(value, html);
         this.key = key;
         this.angle = angle;
         this.distance = distance;
     }
 
-    public static EndLabel head(SimpleLabel label, @Nullable Double angle, @Nullable Double distance) {
+    public static EndLabel head(SimpleLabel label, Double angle, Double distance) {
         return new EndLabel("headlabel", label.value, label.html, angle, distance);
     }
 
-    public static EndLabel tail(SimpleLabel label, @Nullable Double angle, @Nullable Double distance) {
+    public static EndLabel tail(SimpleLabel label, Double angle, Double distance) {
         return new EndLabel("taillabel", label.value, label.html, angle, distance);
     }
 

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

@@ -15,7 +15,6 @@
  */
 package guru.nidi.graphviz.attribute;
 
-import javax.annotation.Nullable;
 import java.util.Objects;
 import java.util.stream.Stream;
 
@@ -36,13 +35,11 @@ public enum Location {
     private final boolean external;
     private final boolean floating;
     private final boolean decorated;
-    @Nullable
     private final Justification just;
-    @Nullable
     private final Location loc;
 
     private Label(String value, boolean html, boolean external, boolean floating, boolean decorated,
-                  @Nullable Justification just, @Nullable Location loc) {
+                  Justification just, Location loc) {
         super(value, html);
         this.external = external;
         this.floating = floating;

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

@@ -15,7 +15,6 @@
  */
 package guru.nidi.graphviz.attribute;
 
-import javax.annotation.Nullable;
 import java.util.*;
 import java.util.Map.Entry;
 
@@ -31,7 +30,7 @@ public Attributes<? super F> applyTo(MapAttributes<? super F> attrs) {
         return attrs;
     }
 
-    public <G extends For> MapAttributes<G> add(String key, @Nullable Object value) {
+    public <G extends For> MapAttributes<G> add(String key, Object value) {
         if (value == null) {
             attributes.remove(key);
         } else {

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

@@ -15,8 +15,6 @@
  */
 package guru.nidi.graphviz.attribute;
 
-import javax.annotation.Nullable;
-
 public final class Rank {
     private Rank() {
     }
@@ -48,15 +46,13 @@ private static class SubgraphRank extends SingleAttributes<String, ForGraph> {
     }
 
     public static class GraphRank implements Attributes<ForGraph> {
-        @Nullable
         private final RankDir dir;
-        @Nullable
         private final Double sep;
         private final boolean equally;
         private final boolean cluster;
         private final boolean newRank;
 
-        GraphRank(@Nullable RankDir dir, @Nullable Double sep, boolean equally,
+        GraphRank(RankDir dir, Double sep, boolean equally,
                   boolean cluster, boolean newRank) {
             this.dir = dir;
             this.sep = sep;

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

@@ -15,8 +15,6 @@
  */
 package guru.nidi.graphviz.attribute;
 
-import javax.annotation.Nullable;
-
 import static guru.nidi.graphviz.attribute.Attributes.attr;
 import static guru.nidi.graphviz.attribute.Attributes.attrs;
 import static guru.nidi.graphviz.attribute.NodeAttr.nodeAttr;
@@ -69,14 +67,11 @@ public static Polygon polygon(int sides) {
 
     public static class Polygon implements Attributes<ForNode> {
         private final int sides;
-        @Nullable
         private final Double skew;
-        @Nullable
         private final Double distortion;
-        @Nullable
         private final Double rotation;
 
-        Polygon(int sides, @Nullable Double skew, @Nullable Double distortion, @Nullable Double rotation) {
+        Polygon(int sides, Double skew, Double distortion, Double rotation) {
             this.sides = sides;
             this.skew = skew;
             this.distortion = distortion;