Changeset 19048 in josm for trunk/src/org/openstreetmap/josm/io/NoteReader.java

Timestamp:

2024-04-19T16:21:11+02:00 (4 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/io/NoteReader.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/io/NoteReader.java

@@ -52 +52 @@
      * Reads both API style and planet dump style formats.
      */
-    private class Parser extends DefaultHandler {
+    private final class Parser extends DefaultHandler {
 
         private NoteParseMode parseMode;
@@ -73 +73 @@
         public void startElement(String uri, String localName, String qName, Attributes attrs) throws SAXException {
             buffer.setLength(0);
-            switch(qName) {
+            switch (qName) {
             case "osm":
                 parseMode = NoteParseMode.API;
@@ -92 +92 @@
 
             //The rest only applies for dump mode
-            switch(qName) {
+            switch (qName) {
             case "note":
                 thisNote = parseNoteFull(attrs);
@@ -113 +113 @@
             }
             if ("comment".equals(qName)) {
-                User commentUser = User.createOsmUser(commentUid, commentUsername);
+                final User commentUser;
                 if (commentUid == 0) {
                     commentUser = User.getAnonymous();
+                } else {
+                    commentUser = User.createOsmUser(commentUid, commentUsername);
                 }
                 if (parseMode == NoteParseMode.API) {
@@ -177 +179 @@
 
     static LatLon parseLatLon(UnaryOperator<String> attrs) {
-        double lat = Double.parseDouble(attrs.apply("lat"));
-        double lon = Double.parseDouble(attrs.apply("lon"));
+        final var lat = Double.parseDouble(attrs.apply("lat"));
+        final var lon = Double.parseDouble(attrs.apply("lon"));
         return new LatLon(lat, lon);
     }
@@ -195 +197 @@
 
     static Note parseNoteFull(UnaryOperator<String> attrs) {
-        Note note = parseNoteBasic(attrs);
+        final var note = parseNoteBasic(attrs);
         String id = attrs.apply("id");
         if (id != null) {