Changeset 34960 in osm

Timestamp:

2019-04-02T08:43:52+02:00 (6 years ago)

Author:

gerdp

Message:

fix some sonarLint issues

File:

• applications/editors/josm/plugins/reverter/src/reverter/MultiOsmReader.java (modified) (2 diffs)

applications/editors/josm/plugins/reverter/src/reverter/MultiOsmReader.java

@@ -5 +5 @@
 import java.io.InputStreamReader;
 
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.io.UTFInputStreamReader;
+import org.openstreetmap.josm.tools.XmlUtils;
 
 /**
@@ -19 +16 @@
 public class MultiOsmReader extends OsmReader {
 
+    /**
+     * Parse data in source and add to existing dataset.
+     * @param source the input stream with OSM data
+     * @throws IllegalDataException in case of any exception
+     */
     public void addData(InputStream source) throws IllegalDataException {
-        try {
-            InputStreamReader ir = UTFInputStreamReader.create(source, "UTF-8");
-            XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(ir);
-            setParser(parser);
+        try (InputStreamReader ir = UTFInputStreamReader.create(source)) {
+            setParser(XmlUtils.newSafeXMLInputFactory().createXMLStreamReader(ir));
             parse();
-        } catch (XMLStreamException e) {
-           throw new IllegalDataException(e);
         } catch (Exception e) {
             throw new IllegalDataException(e);