Changeset 36122 in osm for applications/editors/josm/plugins/livegps

Timestamp:

2023-08-22T17:40:36+02:00 (17 months ago)

Author:

taylor.smock

Message:

Use jakarta.json instead of java.json

This also fixes various lint issues

File:

• applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java (modified) (12 diffs)

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java

@@ -16 +16 @@
 import java.util.List;
 
-import javax.json.Json;
-import javax.json.JsonException;
-import javax.json.JsonNumber;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonException;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
 
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -28 +29 @@
  */
 public class LiveGpsAcquirer implements Runnable {
-    private String gpsdHost;
-    private int gpsdPort;
+    private final String gpsdHost;
+    private final int gpsdPort;
 
     private Socket gpsdSocket;
     private BufferedReader gpsdReader;
-    private boolean connected = false;
-    private boolean shutdownFlag = false;
+    private boolean connected;
+    private boolean shutdownFlag;
     private boolean JSONProtocol = true;
-    private long skipTime = 0L;
-    private int skipNum = 0;
+    private long skipTime;
+    private int skipNum;
 
     private final List<PropertyChangeListener> propertyChangeListener = new ArrayList<>();
@@ -122 +123 @@
     public void run() {
         LiveGpsData oldGpsData = null;
-        LiveGpsData gpsData = null;
+        LiveGpsData gpsData;
 
         shutdownFlag = false;
@@ -131 +132 @@
                     connect();
                 } catch (IOException iox) {
+                    Logging.trace(iox);
                     fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.CONNECTION_FAILED, tr("Connection Failed"));
                     try {
                         Thread.sleep(1000);
-                    } catch (InterruptedException ignore) {
-                        Logging.trace(ignore);
+                    } catch (InterruptedException interruptedException) {
+                        Logging.trace(interruptedException);
+                        Thread.currentThread().interrupt();
                     }
                 }
@@ -155 +158 @@
                     throw new IOException();
 
-                if (JSONProtocol == true)
+                if (JSONProtocol)
                     gpsData = parseJSON(line);
                 else
@@ -173 +176 @@
                 try {
                     Thread.sleep(1000);
-                } catch (InterruptedException ignore) {
-                    Logging.trace(ignore);
+                } catch (InterruptedException interruptedException) {
+                    Logging.trace(interruptedException);
+                    Thread.currentThread().interrupt();
                 }
                 // send warning to layer
@@ -219 +223 @@
         }
 
-        if (gpsdSocket == null || gpsdSocket.isConnected() == false) {
+        if (gpsdSocket == null || !gpsdSocket.isConnected()) {
             if (skipTime == 0)
                 skipTime = System.currentTimeMillis()+60000;
@@ -237 +241 @@
             return;
 
-        try {
-            greeting = Json.createReader(new StringReader(line)).readObject();
+        try (JsonReader reader = Json.createReader(new StringReader(line))) {
+            greeting = reader.readObject();
             type = greeting.getString("class");
-            if (type.equals("VERSION")) {
+            if ("VERSION".equals(type)) {
                 release = greeting.getString("release");
                 Logging.info("LiveGps: Connected to gpsd " + release);
@@ -252 +256 @@
                 fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.CONNECTED, tr("Connected"));
             }
-        }
-
-        if (JSONProtocol == true) {
+            Logging.trace(jex);
+        }
+
+        if (JSONProtocol) {
             JsonObject watch = Json.createObjectBuilder()
                     .add("enable", true)
@@ -276 +281 @@
             gpsdSocket.close();
             gpsdSocket = null;
-        } catch (Exception e) {
+        } catch (IOException e) {
             Logging.warn("LiveGps: Unable to close socket; reconnection may not be possible");
-        }
-    }
-
-    private LiveGpsData parseJSON(String line) {
+            Logging.trace(e);
+        }
+    }
+
+    private static LiveGpsData parseJSON(String line) {
         JsonObject report;
         double lat, lon;
@@ -289 +295 @@
         float epy = 0;
 
-        try {
-            report = Json.createReader(new StringReader(line)).readObject();
+        try (JsonReader reader = Json.createReader(new StringReader(line))) {
+            report = reader.readObject();
         } catch (JsonException jex) {
             Logging.warn("LiveGps: line read from gpsd is not a JSON object:" + line);
+            Logging.trace(jex);
             return null;
         }
-        if (!report.getString("class").equals("TPV") || report.getInt("mode") < 2)
+        if (!"TPV".equals(report.getString("class")) || report.getInt("mode") < 2)
             return null;
 
@@ -322 +329 @@
     }
 
-    private LiveGpsData parseOld(String line) {
+    private static LiveGpsData parseOld(String line) {
         String[] words;
-        double lat = 0;
-        double lon = 0;
+        double lat;
+        double lon;
         float speed = 0;
         float course = 0;
 
         words = line.split(",");
-        if ((words.length == 0) || !words[0].equals("GPSD"))
+        if ((words.length == 0) || !"GPSD".equals(words[0]))
             return null;