Ticket #18232: 18232.patch

src/org/openstreetmap/josm/data/validation/Test.java

@@ -7 +7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Predicate;
 
@@ -38 +37 @@
  *
  * @author frsantos
  */
-public class Test implements OsmPrimitiveVisitor, Comparable<Test> {
+public class Test implements OsmPrimitiveVisitor {
 
     protected static final Predicate<OsmPrimitive> IN_DOWNLOADED_AREA = new NotOutsideDataSourceArea();
     protected static final Predicate<OsmPrimitive> IN_DOWNLOADED_AREA_STRICT = new InDataSourceArea(true);
@@ -364 +363 @@
         return p.hasTag("landuse", "residential");
     }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(name, description);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (obj == null || getClass() != obj.getClass()) return false;
-        Test test = (Test) obj;
-        return Objects.equals(name, test.name) &&
-               Objects.equals(description, test.description);
-    }
-
-    @Override
-    public int compareTo(Test t) {
-        return name.compareTo(t.name);
-    }
-
     /**
      * Free resources.
      */

src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -681 +681 @@
         }
 
         @Override
-        public synchronized boolean equals(Object obj) {
-            return super.equals(obj)
-                    || (obj instanceof TagCheck && rule.equals(((TagCheck) obj).rule))
-                    || (obj instanceof GroupedMapCSSRule && rule.equals(obj));
-        }
-
-        @Override
-        public synchronized int hashCode() {
-            return Objects.hash(super.hashCode(), rule);
-        }
-
-        @Override
         public String toString() {
             return "MapCSSTagCheckerAndRule [rule=" + rule + ']';
         }
@@ -929 +917 @@
                 addPrimitive(ds, p);
                 final Collection<TestError> pErrors = getErrorsForPrimitive(p, true, checksToRun);
                 Logging.debug("- Errors: {0}", pErrors);
-                @SuppressWarnings({"EqualsBetweenInconvertibleTypes", "EqualsIncompatibleType"})
-                final boolean isError = pErrors.stream().anyMatch(e -> e.getTester().equals(check.rule));
+                final boolean isError = pErrors.stream().anyMatch(e -> e.getTester() instanceof MapCSSTagCheckerAndRule
+                        && ((MapCSSTagCheckerAndRule) e.getTester()).rule.equals(check.rule));
                 if (isError != i.getValue()) {
                     assertionErrors.add(MessageFormat.format("Expecting test ''{0}'' (i.e., {1}) to {2} {3} (i.e., {4})",
                             check.getMessage(p), check.rule.selectors, i.getValue() ? "match" : "not match", i.getKey(), p.getKeys()));
@@ -958 +946 @@
         ds.addPrimitive(p);
     }
 
-    @Override
-    public synchronized int hashCode() {
-        return Objects.hash(super.hashCode(), checks);
-    }
-
-    @Override
-    public synchronized boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (obj == null || getClass() != obj.getClass()) return false;
-        if (!super.equals(obj)) return false;
-        MapCSSTagChecker that = (MapCSSTagChecker) obj;
-        return Objects.equals(checks, that.checks);
-    }
-
     /**
      * Reload tagchecker rule.
      * @param rule tagchecker rule to reload

src/org/openstreetmap/josm/data/validation/tests/SharpAngles.java

@@ -5 +5 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Objects;
 import java.util.TreeSet;
 
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -151 +150 @@
         maxAngle = angle;
     }
 
-    @Override
-    public int hashCode() {
-        return 31 * super.hashCode() + Objects.hash(ignoreHighways, maxAngle, maxLength);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (!super.equals(obj) || getClass() != obj.getClass())
-            return false;
-        SharpAngles other = (SharpAngles) obj;
-        return Objects.equals(ignoreHighways, other.ignoreHighways)
-                && Double.doubleToLongBits(maxAngle) == Double.doubleToLongBits(other.maxAngle)
-                && Double.doubleToLongBits(maxLength) == Double.doubleToLongBits(other.maxLength);
-    }
 }