Changeset 15588 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

Timestamp:

2019-12-13T22:12:24+01:00 (4 years ago)

Author:

Don-vip

Message:

tools update: checkstyle 8.27, pmd 6.20, spotbugs 3.1.12

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
@@ -20 +19 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.StringTokenizer;
@@ -86 +86 @@
         super("RemoteControl request processor");
         this.setDaemon(true);
-        this.request = request;
+        this.request = Objects.requireNonNull(request);
     }
 
@@ -94 +94 @@
      */
     public static void processRequest(Socket request) {
-        RequestProcessor processor = new RequestProcessor(request);
-        processor.start();
+        new RequestProcessor(request).start();
     }
 
@@ -167 +166 @@
     @Override
     public void run() {
-        Writer out = null;
-        try {
-            OutputStream raw = new BufferedOutputStream(request.getOutputStream());
-            out = new OutputStreamWriter(raw, RESPONSE_CHARSET);
-            BufferedReader in = new BufferedReader(new InputStreamReader(request.getInputStream(), "ASCII"));
+        Writer out = null; // NOPMD
+        try { // NOPMD
+            out = new OutputStreamWriter(new BufferedOutputStream(request.getOutputStream()), RESPONSE_CHARSET);
+            BufferedReader in = new BufferedReader(new InputStreamReader(request.getInputStream(), "ASCII")); // NOPMD
 
             String get = in.readLine();
@@ -274 +272 @@
                 }
             }
-
         } catch (IOException ioe) {
             Logging.debug(Logging.getErrorMessage(ioe));
@@ -423 +420 @@
             }
 
-            PrintWriter r = new PrintWriter(w);
-            printJsonInfo(cmd, r, handler);
-            return w.toString();
+            try (PrintWriter r = new PrintWriter(w)) {
+                printJsonInfo(cmd, r, handler);
+                return w.toString();
+            }
         } catch (IOException e) {
             Logging.error(e);