drop lombok dependency

replace @EqualsAndHashCode with self-supplied "equals" and "hashcode" implementations according to "Effective Java" best practices. Speeds up the build process and reduces the dependencies on other projects.
LearnLib · Nov 27, 2018 · b00ecd0 · b00ecd0
1 parent 5d31f54
commit b00ecd0
Show file tree

Hide file tree

Showing 21 changed files with 285 additions and 79 deletions.
diff --git a/adapters/brics/pom.xml b/adapters/brics/pom.xml
@@ -40,10 +40,6 @@ limitations under the License.
             <artifactId>automata-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>

diff --git a/adapters/brics/src/main/java/net/automatalib/brics/BricsTransitionProperty.java b/adapters/brics/src/main/java/net/automatalib/brics/BricsTransitionProperty.java
@@ -16,14 +16,12 @@
 package net.automatalib.brics;
 
 import dk.brics.automaton.Transition;
-import lombok.EqualsAndHashCode;
 
 /**
  * The properties of an edge in a Brics automaton.
  *
  * @author Malte Isberner
  */
-@EqualsAndHashCode
 public class BricsTransitionProperty {
 
     private final char min;
@@ -88,4 +86,24 @@ public static String toString(char min, char max) {
         return sb.toString();
     }
 
+    @Override
+    public final boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof BricsTransitionProperty)) {
+            return false;
+        }
+
+        final BricsTransitionProperty that = (BricsTransitionProperty) o;
+        return min == that.min && max == that.max;
+    }
+
+    @Override
+    public final int hashCode() {
+        int result = 1;
+        result = 31 * result + Character.hashCode(min);
+        result = 31 * result + Character.hashCode(max);
+        return result;
+    }
 }
diff --git a/api/pom.xml b/api/pom.xml
@@ -59,11 +59,6 @@ limitations under the License.
             <artifactId>metainf-services</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>

diff --git a/api/src/main/java/net/automatalib/automata/graphs/TransitionEdge.java b/api/src/main/java/net/automatalib/automata/graphs/TransitionEdge.java
@@ -15,10 +15,10 @@
  */
 package net.automatalib.automata.graphs;
 
-import lombok.EqualsAndHashCode;
+import java.util.Objects;
+
 import net.automatalib.ts.UniversalTransitionSystem;
 
-@EqualsAndHashCode
 public final class TransitionEdge<I, T> {
 
     private final I input;
@@ -41,7 +41,27 @@ public <TP> Property<I, TP> property(UniversalTransitionSystem<?, ?, T, ?, TP> u
         return new Property<>(input, uts.getTransitionProperty(transition));
     }
 
-    @EqualsAndHashCode
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof TransitionEdge)) {
+            return false;
+        }
+
+        final TransitionEdge<?, ?> that = (TransitionEdge<?, ?>) o;
+        return Objects.equals(input, that.input) && Objects.equals(transition, that.transition);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = 1;
+        result = 31 * result + Objects.hashCode(input);
+        result = 31 * result + Objects.hashCode(transition);
+        return result;
+    }
+
     public static final class Property<I, TP> {
 
         private final I input;
@@ -59,5 +79,26 @@ public I getInput() {
         public TP getProperty() {
             return property;
         }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (!(o instanceof Property)) {
+                return false;
+            }
+
+            final Property<?, ?> that = (Property<?, ?>) o;
+            return Objects.equals(input, that.input) && Objects.equals(property, that.property);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = 1;
+            result = 31 * result + Objects.hashCode(input);
+            result = 31 * result + Objects.hashCode(property);
+            return result;
+        }
     }
 }
diff --git a/...src/main/java/net/automatalib/automata/transducers/probabilistic/ProbabilisticOutput.java b/...src/main/java/net/automatalib/automata/transducers/probabilistic/ProbabilisticOutput.java
@@ -15,13 +15,12 @@
  */
 package net.automatalib.automata.transducers.probabilistic;
 
+import java.util.Objects;
+
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 
-import lombok.EqualsAndHashCode;
-
 @ParametersAreNonnullByDefault
-@EqualsAndHashCode
 public final class ProbabilisticOutput<O> {
 
     private final float probability;
@@ -41,4 +40,25 @@ public float getProbability() {
     public O getOutput() {
         return output;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof ProbabilisticOutput)) {
+            return false;
+        }
+
+        final ProbabilisticOutput<?> that = (ProbabilisticOutput<?>) o;
+        return Float.compare(probability, that.probability) == 0 && Objects.equals(output, that.output);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = 1;
+        result = 31 * result + Float.hashCode(probability);
+        result = 31 * result + Objects.hashCode(output);
+        return result;
+    }
 }
diff --git a/commons/smartcollections/pom.xml b/commons/smartcollections/pom.xml
@@ -47,11 +47,6 @@ limitations under the License.
             <artifactId>jsr305</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>

diff --git a/...smartcollections/src/main/java/net/automatalib/commons/smartcollections/ArrayStorage.java b/...smartcollections/src/main/java/net/automatalib/commons/smartcollections/ArrayStorage.java
@@ -17,12 +17,11 @@
 
 import java.io.Serializable;
 import java.util.AbstractList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.RandomAccess;
 import java.util.function.Supplier;
 
-import lombok.EqualsAndHashCode;
-
 /**
  * A thin wrapper around a simple {@code Object[]} array. Mainly used (and useful) for heavily generic and array-based
  * data storage. Extends/Implements some convenient classes/interfaces.
@@ -32,8 +31,7 @@
  *
  * @author frohme
  */
-@EqualsAndHashCode(callSuper = false)
-public class ArrayStorage<T> extends AbstractList<T> implements RandomAccess, Serializable, Cloneable {
+public final class ArrayStorage<T> extends AbstractList<T> implements RandomAccess, Serializable, Cloneable {
 
     private final Object[] storage;
 
@@ -78,4 +76,22 @@ public int size() {
     public ArrayStorage<T> clone() {
         return new ArrayStorage<>(storage.clone());
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof ArrayStorage)) {
+            return false;
+        }
+
+        final ArrayStorage<?> that = (ArrayStorage<?>) o;
+        return Arrays.equals(storage, that.storage);
+    }
+
+    @Override
+    public int hashCode() {
+        return Arrays.hashCode(storage);
+    }
 }
diff --git a/commons/util/pom.xml b/commons/util/pom.xml
@@ -51,10 +51,6 @@ limitations under the License.
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.testng</groupId>

diff --git a/commons/util/src/main/java/net/automatalib/commons/util/Pair.java b/commons/util/src/main/java/net/automatalib/commons/util/Pair.java
@@ -17,8 +17,8 @@
 
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.Objects;
 
-import lombok.EqualsAndHashCode;
 import net.automatalib.commons.util.strings.AbstractPrintable;
 import net.automatalib.commons.util.strings.StringUtil;
 
@@ -39,7 +39,6 @@
  * @author Malte Isberner
  * @author frohme
  */
-@EqualsAndHashCode(callSuper = false)
 public final class Pair<T1, T2> extends AbstractPrintable implements Serializable {
 
     private static final long serialVersionUID = -1L;
@@ -76,4 +75,25 @@ public void print(Appendable a) throws IOException {
         a.append(", ");
         StringUtil.appendObject(a, second);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Pair)) {
+            return false;
+        }
+
+        final Pair<?, ?> that = (Pair<?, ?>) o;
+        return Objects.equals(first, that.first) && Objects.equals(second, that.second);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = 1;
+        result = 31 * result + Objects.hashCode(first);
+        result = 31 * result + Objects.hashCode(second);
+        return result;
+    }
 }
diff --git a/commons/util/src/main/java/net/automatalib/commons/util/Triple.java b/commons/util/src/main/java/net/automatalib/commons/util/Triple.java
@@ -17,8 +17,8 @@
 
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.Objects;
 
-import lombok.EqualsAndHashCode;
 import net.automatalib.commons.util.strings.AbstractPrintable;
 import net.automatalib.commons.util.strings.StringUtil;
 
@@ -41,7 +41,6 @@
  * @author Malte Isberner
  * @author frohme
  */
-@EqualsAndHashCode(callSuper = false)
 public final class Triple<T1, T2, T3> extends AbstractPrintable implements Serializable {
 
     private static final long serialVersionUID = -1L;
@@ -87,4 +86,26 @@ public void print(Appendable a) throws IOException {
         StringUtil.appendObject(a, third);
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Triple)) {
+            return false;
+        }
+
+        final Triple<?, ?, ?> that = (Triple<?, ?, ?>) o;
+        return Objects.equals(first, that.first) && Objects.equals(second, that.second) &&
+               Objects.equals(third, that.third);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = 1;
+        result = 31 * result + Objects.hashCode(first);
+        result = 31 * result + Objects.hashCode(second);
+        result = 31 * result + Objects.hashCode(third);
+        return result;
+    }
 }
diff --git a/core/pom.xml b/core/pom.xml
@@ -67,10 +67,6 @@ limitations under the License.
             <groupId>org.kohsuke.metainf-services</groupId>
             <artifactId>metainf-services</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.testng</groupId>

diff --git a/...c/main/java/net/automatalib/automata/transducers/impl/compact/CompactMealyTransition.java b/...c/main/java/net/automatalib/automata/transducers/impl/compact/CompactMealyTransition.java
@@ -16,11 +16,9 @@
 package net.automatalib.automata.transducers.impl.compact;
 
 import java.io.Serializable;
+import java.util.Objects;
 
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode
-public class CompactMealyTransition<O> implements Serializable {
+public final class CompactMealyTransition<O> implements Serializable {
 
     private int memoryIdx;
     private final int succId;
@@ -59,4 +57,26 @@ void setMemoryIdx(int memoryIdx) {
     boolean isAutomatonTransition() {
         return memoryIdx >= 0;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof CompactMealyTransition)) {
+            return false;
+        }
+
+        final CompactMealyTransition<?> that = (CompactMealyTransition<?>) o;
+        return memoryIdx == that.memoryIdx && succId == that.succId && Objects.equals(output, that.output);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = 1;
+        result = 31 * result + Integer.hashCode(memoryIdx);
+        result = 31 * result + Integer.hashCode(succId);
+        result = 31 * result + Objects.hashCode(output);
+        return result;
+    }
 }