Changeset 36122 in osm for applications/editors/josm/plugins/geochat/src

Timestamp:

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

Author:

taylor.smock

Message:

Use jakarta.json instead of java.json

This also fixes various lint issues

Location:

applications/editors/josm/plugins/geochat/src/geochat

Files:

• ChatServerConnection.java (modified) (7 diffs)
• JsonQueryCallback.java (modified) (1 diff)
• JsonQueryUtil.java (modified) (3 diffs)

applications/editors/josm/plugins/geochat/src/geochat/ChatServerConnection.java

@@ -15 +15 @@
 import java.util.Set;
 
-import javax.json.JsonArray;
-import javax.json.JsonException;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
 
 import org.openstreetmap.josm.data.coor.ILatLon;
@@ -41 +41 @@
     private String userName;
     private static ChatServerConnection instance;
-    private Set<ChatServerConnectionListener> listeners;
-    private LogRequest requestThread;
+    private final Set<ChatServerConnectionListener> listeners;
+    private final LogRequest requestThread;
 
     private ChatServerConnection() {
@@ -123 +123 @@
                 }
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
                 Logging.warn(e);
             }
@@ -279 +280 @@
         double l = lat / 180 * Math.PI;
         double pf = Math.log(Math.tan(l) + (1 / Math.cos(l)));
-        return Math.pow(2.0, zoom - 1) * (Math.PI - pf) / Math.PI;
+        return Math.pow(2.0, zoom - 1d) * (Math.PI - pf) / Math.PI;
     }
 
     private static double lonToTileX(double lon, int zoom) {
-        return Math.pow(2.0, zoom - 3) * (lon + 180.0) / 45.0;
+        return Math.pow(2.0, zoom - 3d) * (lon + 180.0) / 45.0;
     }
 
@@ -305 +306 @@
         double factor = screenPixels / tilePixels;
         double result = Math.log(factor) / Math.log(2) / 2 + 1;
-        int intResult = (int) Math.floor(result);
-        return intResult;
+        return (int) Math.floor(result);
     }
 
     private class LogRequest implements Runnable {
         private static final int MAX_JUMP = 20000; // in meters
-        private LatLon lastPosition = null;
-        private long lastUserId = 0;
-        private long lastId = 0;
-        private boolean lastStatus = false;
-        private boolean stopping = false;
+        private LatLon lastPosition;
+        private long lastUserId;
+        private long lastId;
+        private boolean lastStatus;
+        private boolean stopping;
 
         @Override
@@ -324 +324 @@
                 process();
                 try {
-                    Thread.sleep(interval * 1000);
+                    Thread.sleep(interval * 1000L);
                 } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
                     stopping = true;
+                    Logging.trace(e);
                 }
             }
@@ -367 +369 @@
                 json = JsonQueryUtil.query(query, true);
             } catch (IOException ex) {
+                Logging.trace(ex);
                 json = null; // ?
             }

applications/editors/josm/plugins/geochat/src/geochat/JsonQueryCallback.java

@@ -2 +2 @@
 package geochat;
 
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 
 /**

applications/editors/josm/plugins/geochat/src/geochat/JsonQueryUtil.java

@@ -5 +5 @@
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
+import java.net.URI;
 
-import javax.json.Json;
-import javax.json.JsonException;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
 
 import org.openstreetmap.josm.gui.MainApplication;
@@ -43 +44 @@
     public static JsonObject query(String query, boolean logAtDebug) throws IOException {
         String serverURL = Config.getPref().get("geochat.server", "https://zverik.dev.openstreetmap.org/osmochat.php?action=");
-        URL url = new URL(serverURL + query);
-        Response connection = HttpClient.create(url).setLogAtDebug(logAtDebug).connect();
+        URI url = URI.create(serverURL + query);
+        Response connection = HttpClient.create(url.toURL()).setLogAtDebug(logAtDebug).connect();
         if (connection.getResponseCode() != 200) {
             throw new IOException("HTTP Response code " + connection.getResponseCode() + " (" + connection.getResponseMessage() + ")");
@@ -51 +52 @@
         if (inp == null)
             throw new IOException("Empty response");
-        try {
-            return Json.createReader(inp).readObject();
+        try (JsonReader reader = Json.createReader(inp)){
+            return reader.readObject();
         } catch (JsonException e) {
             throw new IOException("Failed to parse JSON: " + e.getMessage(), e);