Changeset 16550 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java

Timestamp:

2020-06-07T13:09:55+02:00 (4 years ago)

Author:

simon04

Message:

RequestProcessor.getHandlersInfoAsJSON: use javax.json

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
 import org.openstreetmap.josm.io.remotecontrol.RequestProcessor;
-import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -20 +22 @@
 
     @Override
-    protected void handleRequest() throws RequestHandlerErrorException,
-            RequestHandlerBadRequestException {
-        StringBuilder buf = new StringBuilder();
+    protected void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException {
         String q = args.get("q");
-        if (q != null) {
-            buf.append('[');
-            boolean first = true;
-            for (String s: q.split("[,\\s]+")) {
-               if (first) {
-                   first = false;
-               } else {
-                   buf.append(", ");
-               }
-               String info = RequestProcessor.getHandlerInfoAsJSON('/'+s);
-               if (info != null) {
-                   buf.append(info);
-               } else {
-                   Logging.warn("Unknown handler {0} passed to /features request", s);
-               }
-            }
-            buf.append(']');
-        } else {
-            buf.append(RequestProcessor.getHandlersInfoAsJSON());
-        }
-
-        content = buf.toString();
+        Collection<String> handlers = q == null ? null : Arrays.asList(q.split("[,\\s]+"));
+        content = RequestProcessor.getHandlersInfoAsJSON(handlers).toString();
         contentType = "application/json";
         if (args.containsKey("jsonp")) {