Changeset 4834 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

Timestamp:

2012-01-21T12:07:57+01:00 (12 years ago)

Author:

simon04

Message:

remotecontrol: primt more helpful Bad Request errors, i.e., list available commands, or show missing parameter

File:

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

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

@@ -5 +5 @@
 
 import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.StringTokenizer;
 
@@ -11 +13 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -91 +94 @@
     }
 
-    protected String[] getMandatoryParams()
-    {
+    public String[] getMandatoryParams() {
         return null;
     }
@@ -169 +171 @@
         if(mandatory == null) return;
 
+        List<String> missingKeys = new LinkedList<String>();
         boolean error = false;
         for (int i = 0; i < mandatory.length; ++i) {
@@ -176 +179 @@
                 error = true;
                 System.out.println("'" + myCommand + "' remote control request must have '" + key + "' parameter");
+                missingKeys.add(key);
             }
         }
-        if (error)
-            throw new RequestHandlerBadRequestException();
+        if (error) {
+            throw new RequestHandlerBadRequestException(
+                    "The following keys are mandatory, but have not been provided: "
+                    + Utils.join(", ", missingKeys));
+        }
     }
 
@@ -204 +211 @@
 
     public static class RequestHandlerException extends Exception {
+
+        public RequestHandlerException(String message) {
+            super(message);
+        }
+
+        public RequestHandlerException() {
+        }
     }
 
@@ -210 +224 @@
 
     public static class RequestHandlerBadRequestException extends RequestHandlerException {
+
+        public RequestHandlerBadRequestException(String message) {
+            super(message);
+        }
     }