Drop RequestParameter annotation.

gk-brown · gk-brown · commit dfa89efaf0e9 · 2020-02-26T16:44:45.000-05:00
diff --git a/README.md b/README.md
@@ -42,7 +42,6 @@ The HTTP-RPC framework includes the following classes:
 
 * `org.httprpc`
     * `RequestMethod` - associates an HTTP verb with a service method
-    * `RequestParameter` - associates a custom request parameter name with a method argument
     * `ResourcePath` - associates a resource path with a service method
     * `WebServiceException` - thrown when a service operation returns an error
     * `WebServiceProxy` - web service invocation proxy
@@ -72,7 +71,7 @@ These classes are discussed in more detail in the following sections.
 ## WebService
 `WebService` is an abstract base class for web services. It extends the similarly abstract `HttpServlet` class provided by the servlet API. 
 
-Service operations are defined by adding public methods to a concrete service implementation. Methods are invoked by submitting an HTTP request for a path associated with a servlet instance. Arguments are provided either via the query string or in the request body, like an HTML form. `WebService` converts the request parameters to the expected argument types, invokes the method, and writes the return value to the output stream as [JSON](http://json.org).
+Service operations are defined by adding public methods to a concrete service implementation. Methods are invoked by submitting an HTTP request for a path associated with a servlet instance. Arguments are provided either via the query string or in the request body, like an HTML form. `WebService` converts the request parameters to the expected argument types, invokes the method, and writes the return value to the output stream as [JSON](http://json.org). Service classes must be compiled with the `-parameters` flag so the names of their method parameters are available at runtime. 
 
 The `RequestMethod` annotation is used to associate a service method with an HTTP verb such as `GET` or `POST`. The optional `ResourcePath` annotation can be used to associate the method with a specific path relative to the servlet. If unspecified, the method is associated with the servlet itself. If no matching handler method is found for a given request, the default handler (e.g. `doGet()`) is called.
 
@@ -173,16 +172,6 @@ The methods could be invoked using this HTML form:
 
 If no method is found that matches the provided arguments, an HTTP 405 response is returned.
 
-#### Parameter Names
-In general, service classes should be compiled with the `-parameters` flag so the names of their method parameters are available at runtime. However, the `RequestParameter` annotation can be used to customize the name of the parameter associated with a particular argument. For example:
-
-```java
-@RequestMethod("GET")
-public double getTemperature(@RequestParameter("zip_code") String zipCode) { 
-    ... 
-}
-```
-
 ### Path Variables
 Path variables may be specified by a "?" character in the resource path. For example:
 
@@ -1097,9 +1086,9 @@ public static <T> T adapt(URL baseURL, Class<T> type, Map<String, ?> headers) {
 
 Both versions take a base URL and an interface type as arguments and return an instance of the given type that can be used to invoke service operations. The second version also accepts a map of HTTP header values that will be submitted with every service request.
 
-The `RequestMethod` annotation is used to associate an HTTP verb with an interface method. The optional `ResourcePath` annotation can be used to associate the method with a specific path relative to the base URL. If unspecified, the method is associated with the base URL itself.
+The `RequestMethod` annotation is used to associate an HTTP verb with an interface method. The optional `ResourcePath` annotation can be used to associate the method with a specific path relative to the base URL. If unspecified, the method is associated with the base URL itself. 
 
-In general, service adapters should be compiled with the `-parameters` flag so their method parameter names are available at runtime. However, the `RequestParameter` annotation can be used to associate a custom parameter name with a request argument. 
+Service adapters must be compiled with the `-parameters` flag so their method parameter names are available at runtime.
 
 `POST` requests are always submitted using the multi-part encoding. Values are returned as described for `WebServiceProxy` and adapted as described [earlier](#beanadapter) based on the method return type.
 
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@
 
 subprojects {
     group = 'org.httprpc'    
-    version = '7.1.1'
+    version = '7.2'
 
     apply plugin: 'java-library'
     apply plugin: 'maven-publish'
diff --git a/httprpc-client/src/main/java/org/httprpc/RequestParameter.java b/httprpc-client/src/main/java/org/httprpc/RequestParameter.java
diff --git a/httprpc-client/src/main/java/org/httprpc/WebServiceProxy.java b/httprpc-client/src/main/java/org/httprpc/WebServiceProxy.java
@@ -667,11 +667,8 @@ public static <T> T adapt(URL baseURL, Class<T> type, Map<String, ?> headers) {
 
             for (int i = 0; i < parameters.length; i++) {
                 Parameter parameter = parameters[i];
-                RequestParameter requestParameter = parameter.getAnnotation(RequestParameter.class);
 
-                String name = (requestParameter == null) ? parameter.getName() : requestParameter.value();
-
-                argumentMap.put(name, arguments[i]);
+                argumentMap.put(parameter.getName(), arguments[i]);
             }
 
             webServiceProxy.setArguments(argumentMap);
diff --git a/httprpc-server/src/main/java/org/httprpc/WebService.java b/httprpc-server/src/main/java/org/httprpc/WebService.java
@@ -424,7 +424,7 @@ private static Handler getHandler(List<Handler> handlerList, Map<String, List<?>
                 int j = 0;
 
                 for (int k = 0; k < parameters.length; k++) {
-                    String name = getName(parameters[k]);
+                    String name = parameters[k].getName();
 
                     if (!(parameterMap.containsKey(name))) {
                         j++;
@@ -450,12 +450,10 @@ private static Object[] getArguments(Method method, Map<String, List<?>> paramet
         for (int i = 0; i < parameters.length; i++) {
             Parameter parameter = parameters[i];
 
-            String name = getName(parameter);
+            List<?> values = parameterMap.get(parameter.getName());
 
             Class<?> type = parameter.getType();
 
-            List<?> values = parameterMap.get(name);
-
             Object argument;
             if (type == List.class) {
                 Type elementType = ((ParameterizedType)parameter.getParameterizedType()).getActualTypeArguments()[0];
@@ -493,12 +491,6 @@ private static Object[] getArguments(Method method, Map<String, List<?>> paramet
         return arguments;
     }
 
-    private static String getName(Parameter parameter) {
-        RequestParameter requestParameter = parameter.getAnnotation(RequestParameter.class);
-
-        return (requestParameter == null) ? parameter.getName() : requestParameter.value();
-    }
-
     /**
      * Returns the servlet request.
      *
@@ -709,7 +701,7 @@ private void describeResource(String path, Resource resource, TreeMap<Class<?>,
                             xmlStreamWriter.writeCharacters(", ");
                         }
 
-                        xmlStreamWriter.writeCharacters(getName(parameter) + ": ");
+                        xmlStreamWriter.writeCharacters(parameter.getName() + ": ");
 
                         Type type = parameter.getParameterizedType();
 
@@ -749,7 +741,7 @@ private void describeResource(String path, Resource resource, TreeMap<Class<?>,
                                 for (int i = 0; i < parameters.length; i++) {
                                     Parameter parameter = parameters[i];
 
-                                    String parameterName = getName(parameter);
+                                    String parameterName = parameter.getName();
 
                                     xmlStreamWriter.writeStartElement("li");
 
diff --git a/httprpc-test/src/main/java/org/httprpc/test/TestService.java b/httprpc-test/src/main/java/org/httprpc/test/TestService.java
@@ -15,7 +15,6 @@
 package org.httprpc.test;
 
 import org.httprpc.RequestMethod;
-import org.httprpc.RequestParameter;
 import org.httprpc.ResourcePath;
 import org.httprpc.WebService;
 
@@ -53,10 +52,10 @@ public class TestService extends WebService {
     private static final long serialVersionUID = 0;
 
     @RequestMethod("GET")
-    public Map<String, ?> testGet(@RequestParameter("string") String text, List<String> strings, int number, boolean flag,
+    public Map<String, ?> testGet(String string, List<String> strings, int number, boolean flag,
         Date date, LocalDate localDate, LocalTime localTime, LocalDateTime localDateTime) {
         return mapOf(
-            entry("string", text),
+            entry("string", string),
             entry("strings", strings),
             entry("number", number),
             entry("flag", flag),
