Changeset 14099 in josm for trunk

Timestamp:

2018-08-05T23:22:33+02:00 (7 years ago)

Author:

Don-vip

Message:

fix sonarqube issues

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/AbstractReader.java (modified) (2 diffs)
• src/org/openstreetmap/josm/io/OsmJsonReader.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/CertificateAmendmentTestIT.java (modified) (1 diff)

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

@@ -272 +272 @@
     @FunctionalInterface
     protected interface ParserWorker {
-       void accept(InputStreamReader ir) throws IllegalDataException, IOException;
+        /**
+         * Effectively parses the file, depending on the format (XML, JSON, etc.)
+         * @param ir input stream reader
+         * @throws IllegalDataException in case of invalid data
+         * @throws IOException in case of I/O error
+         */
+        void accept(InputStreamReader ir) throws IllegalDataException, IOException;
     }
 
@@ -550 +556 @@
     @FunctionalInterface
     protected interface CommonReader {
-       void accept(PrimitiveData pd) throws IllegalDataException;
+        /**
+         * Reads the common primitive attributes and sets them in {@code pd}
+         * @param pd primitive data to update
+         * @throws IllegalDataException in case of invalid data
+         */
+        void accept(PrimitiveData pd) throws IllegalDataException;
     }
 
     @FunctionalInterface
     protected interface NodeReader {
-       void accept(Node n) throws IllegalDataException;
+        /**
+         * Reads the node tags.
+         * @param n node
+         * @throws IllegalDataException in case of invalid data
+         */
+        void accept(Node n) throws IllegalDataException;
     }
 
     @FunctionalInterface
     protected interface WayReader {
-       void accept(Way w, Collection<Long> nodeIds) throws IllegalDataException;
+        /**
+         * Reads the way nodes and tags.
+         * @param w way
+         * @param nodeIds collection of resulting node ids
+         * @throws IllegalDataException in case of invalid data
+         */
+        void accept(Way w, Collection<Long> nodeIds) throws IllegalDataException;
     }
 
     @FunctionalInterface
     protected interface RelationReader {
-       void accept(Relation r, Collection<RelationMemberData> members) throws IllegalDataException;
+        /**
+         * Reads the relation members and tags.
+         * @param r relation
+         * @param members collection of resulting members
+         * @throws IllegalDataException in case of invalid data
+         */
+        void accept(Relation r, Collection<RelationMemberData> members) throws IllegalDataException;
     }
 

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

@@ -121 +121 @@
     }
 
-    private void readTags(JsonObject item, Tagged t) {
+    private static void readTags(JsonObject item, Tagged t) {
         JsonObject tags = item.getJsonObject("tags");
         if (tags != null) {

trunk/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTestIT.java

@@ -87 +87 @@
         } catch (SSLHandshakeException e) {
             if (shouldWork) {
-                e.printStackTrace();
-                Assert.fail("Untrusted: " + url);
+                throw new IOException("Untrusted: " + url, e);
             } else {
                 return;