Changeset 19048 in josm for trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

Timestamp:

2024-04-19T16:21:11+02:00 (6 weeks ago)

Author:

taylor.smock

Message:

Dependency updates

ivy.xml

• org.eclipse.parsson:parsson: 1.1.5 -> 1.1.6
• org.apache.commons:commons-compress: 1.25.0 -> 1.26.1
  • Note: This deprecated some functions
• ch.poole:OpeningHoursParser: 0.28.1 -> 0.28.2
• org.jacoco:org.jacoco.ant: 0.8.11 -> 0.8.12
• com.github.spotbugs:spotbugs-annotations: 4.8.3 -> 4.8.4
• com.github.tomakehurst:wiremock: 2.35.0 -> 3.0.1
• io.github.classgraph:classgraph: 4.8.165 -> 4.8.171
• nl.jqno.equalsverifier:equalsverifier: 3.15.6 -> 3.16.1
• org.awaitility:awaitility: 4.2.0 -> 4.2.1

tools/ivy.xml

• com.puppycrawl.tools:checkstyle: 9.3 -> 10.15.0
• com.github.spotbugs:spotbugs: 4.8.3 -> 4.8.4
• com.google.errorprone: 2.(10.0|24.1) -> 2.26.1
• net.sourceforge.pmd:pmd was not updated to 7.0.0 due to a significant number of false positives.

There were some additional changes to cleanup new warnings and remove some
additional Java 8 files. There are more warnings that need to be cleaned up.

File:

• trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java (modified) (15 diffs)

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -23 +23 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -160 +159 @@
         @Override
         public Match get(String keyword, boolean caseSensitive, boolean regexSearch, PushbackTokenizer tokenizer) throws SearchParseError {
-            switch(keyword) {
+            switch (keyword) {
             case MODIFIED:
                 return new Modified();
@@ -1140 +1139 @@
                     value = Normalizer.normalize(value, Normalizer.Form.NFC);
 
-                    Matcher keyMatcher = searchRegex.matcher(key);
-                    Matcher valMatcher = searchRegex.matcher(value);
+                    final var keyMatcher = searchRegex.matcher(key);
+                    final var valMatcher = searchRegex.matcher(value);
 
                     boolean keyMatchFound = keyMatcher.find();
@@ -1623 +1622 @@
      * Matches objects that are new (i.e. have not been uploaded to the server)
      */
-    private static class New extends Match {
+    private static final class New extends Match {
         @Override
         public boolean match(OsmPrimitive osm) {
@@ -1638 +1637 @@
      * Matches all objects that have been modified, created, or undeleted
      */
-    private static class Modified extends Match {
+    private static final class Modified extends Match {
         @Override
         public boolean match(OsmPrimitive osm) {
@@ -1653 +1652 @@
      * Matches all objects that have been deleted
      */
-    private static class Deleted extends Match {
+    private static final class Deleted extends Match {
         @Override
         public boolean match(OsmPrimitive osm) {
@@ -1668 +1667 @@
      * Matches all objects currently selected
      */
-    private static class Selected extends Match {
+    private static final class Selected extends Match {
         @Override
         public boolean match(OsmPrimitive osm) {
@@ -1685 +1684 @@
      * fetched from the server.
      */
-    private static class Incomplete extends Match {
+    private static final class Incomplete extends Match {
         @Override
         public boolean match(OsmPrimitive osm) {
@@ -1702 +1701 @@
      * org.openstreetmap.josm.data.osm.OsmPrimitive.getUninterestingKeys()
      */
-    private static class Untagged extends Match {
+    private static final class Untagged extends Match {
         @Override
         public boolean match(OsmPrimitive osm) {
@@ -1717 +1716 @@
      * Matches ways which are closed (i.e. first and last node are the same)
      */
-    private static class Closed extends Match {
+    private static final class Closed extends Match {
         @Override
         public boolean match(OsmPrimitive osm) {
@@ -1818 +1817 @@
             if (!(osm instanceof Way))
                 return null;
-            Way way = (Way) osm;
+            final var way = (Way) osm;
             return (long) way.getLength();
         }
@@ -1971 +1970 @@
 
             try {
-                String groupSuffix = name.substring(0, name.length() - 2); // try to remove '/*'
+                final var groupSuffix = name.substring(0, name.length() - 2); // try to remove '/*'
                 TaggingPresetMenu group = preset.group;
 
@@ -2179 +2178 @@
             } else if (tokenizer.readIfEqual(Token.COLON)) {
                 // see if we have a Match that takes a data parameter
-                SimpleMatchFactory factory = simpleMatchFactoryMap.get(key);
+                final var factory = simpleMatchFactoryMap.get(key);
                 if (factory != null)
                     return factory.get(key, caseSensitive, regexSearch, tokenizer);
 
-                UnaryMatchFactory unaryFactory = unaryMatchFactoryMap.get(key);
+                final var unaryFactory = unaryMatchFactoryMap.get(key);
                 if (unaryFactory != null)
                     return getValidate(unaryFactory, key, tokenizer);
@@ -2196 +2195 @@
                 return new BooleanMatch(key, false);
             else {
-                SimpleMatchFactory factory = simpleMatchFactoryMap.get(key);
+                final var factory = simpleMatchFactoryMap.get(key);
                 if (factory != null)
                     return factory.get(key, caseSensitive, regexSearch, null).validate();
 
-                UnaryMatchFactory unaryFactory = unaryMatchFactoryMap.get(key);
+                final var unaryFactory = unaryMatchFactoryMap.get(key);
                 if (unaryFactory != null)
                     return getValidate(unaryFactory, key, null);
@@ -2222 +2221 @@
 
     private static int regexFlags(boolean caseSensitive) {
-        int searchFlags = 0;
+        var searchFlags = 0;
 
         // Enables canonical Unicode equivalence so that e.g. the two