Changeset 16934 in josm for trunk

Timestamp:

2020-08-26T20:24:35+02:00 (4 years ago)

Author:

simon04

Message:

see #19624 - Extract GeoJSONReader.parse(InputStream), use try-with-resources

File:

• trunk/src/org/openstreetmap/josm/io/GeoJSONReader.java (modified) (3 diffs)

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

@@ -67 +67 @@
     }
 
-    private void setParser(final JsonParser parser) {
-        this.parser = parser;
-    }
-
-    private void parse() throws IllegalDataException {
+    private void parse(InputStream inputStream) throws IllegalDataException {
+        try (JsonParser parser = Json.createParser(inputStream)) {
+            parse(parser);
+        } catch (JsonParsingException e) {
+            throw new IllegalDataException(e);
+        }
+    }
+
+    private void parse(final JsonParser parser) throws IllegalDataException {
         while (parser.hasNext()) {
             Event event = parser.next();
@@ -390 +394 @@
                     line = line.replaceFirst(rs, "");
                     try (InputStream is = new ByteArrayInputStream(line.getBytes())) {
-                        setParser(Json.createParser(is));
-                        parse();
-                    } catch (JsonParsingException e) {
-                        throw new IllegalDataException(e);
-                    } finally {
-                        parser.close();
+                        parse(is);
                     }
                 }
@@ -402 +401 @@
             }
         } else {
-            setParser(Json.createParser(markSupported));
-            try {
-                parse();
-            } catch (JsonParsingException e) {
-                throw new IllegalDataException(e);
-            }
+            parse(markSupported);
         }
         return getDataSet();