Update WebServiceProxy.

Author: gk-brown

.idea/dataSources.local.xml

@@ -14,7 +14,7 @@
 
 subprojects {
     group = 'org.httprpc'
-    version = '4.8'
+    version = '4.8.1'
 
     apply plugin: 'java-library'
 

build.gradle

@@ -342,8 +342,6 @@ public Object invoke(Object proxy, Method method, Object[] arguments) throws Thr
 
                 var webServiceProxy = new WebServiceProxy(requestMethod.value(), uri);
 
-                webServiceProxy.setHeaders(headers);
-
                 var parameters = method.getParameters();
 
                 var n = parameters.length;
@@ -370,6 +368,8 @@ public Object invoke(Object proxy, Method method, Object[] arguments) throws Thr
 
                 webServiceProxy.setArguments(argumentMap);
 
+                webServiceProxy.setHeaders(headers);
+
                 if (n < parameters.length) {
                     var body = argumentList.get(n);
 
@@ -446,8 +446,8 @@ private static <T> T instantiate(Class<T> type) {
     private String method;
     private URI uri;
 
-    private Map<String, Object> headers = mapOf();
     private Map<String, Object> arguments = mapOf();
+    private Map<String, Object> headers = mapOf();
 
     private Object body = null;
 
@@ -509,51 +509,51 @@ public WebServiceProxy(String method, URI uri) {
     }
 
     /**
-     * Returns the header map.
+     * Returns the argument map.
      *
      * @return
-     * The header map.
+     * The argument map.
      */
-    public Map<String, Object> getHeaders() {
-        return headers;
+    public Map<String, Object> getArguments() {
+        return arguments;
     }
 
     /**
-     * Sets the header map.
+     * Sets the argument map.
      *
-     * @param headers
-     * The header map.
+     * @param arguments
+     * The argument map.
      */
-    public void setHeaders(Map<String, Object> headers) {
-        if (headers == null) {
+    public void setArguments(Map<String, Object> arguments) {
+        if (arguments == null) {
             throw new IllegalArgumentException();
         }
 
-        this.headers = headers;
+        this.arguments = arguments;
     }
 
     /**
-     * Returns the argument map.
+     * Returns the header map.
      *
      * @return
-     * The argument map.
+     * The header map.
      */
-    public Map<String, Object> getArguments() {
-        return arguments;
+    public Map<String, Object> getHeaders() {
+        return headers;
     }
 
     /**
-     * Sets the argument map.
+     * Sets the header map.
      *
-     * @param arguments
-     * The argument map.
+     * @param headers
+     * The header map.
      */
-    public void setArguments(Map<String, Object> arguments) {
-        if (arguments == null) {
+    public void setHeaders(Map<String, Object> headers) {
+        if (headers == null) {
             throw new IllegalArgumentException();
         }
 
-        this.arguments = arguments;
+        this.headers = headers;
     }
 
     /**
@@ -735,14 +735,18 @@ public Object invoke() throws IOException {
 
         // Append query
         if (!arguments.isEmpty()) {
+            if (uri.getRawQuery() != null || uri.getRawFragment() != null) {
+                throw new IllegalStateException("Query or fragment is already defined.");
+            }
+
             try {
                 uri = new URI(String.format("%s?%s", uri, encodeQuery(arguments)));
             } catch (URISyntaxException exception) {
                 throw new IllegalStateException(exception.getMessage());
             }
         }
 
-        // Open URL connection
+        // Open connection
         var connection = (HttpURLConnection)uri.toURL().openConnection();
 
         connection.setRequestMethod(method);
@@ -756,7 +760,7 @@ public Object invoke() throws IOException {
             locale.getLanguage().toLowerCase(),
             locale.getCountry().toLowerCase()));
 
-        // Apply custom headers
+        // Apply headers
         for (Map.Entry<String, ?> entry : headers.entrySet()) {
             var key = entry.getKey();
             var value = entry.getValue();

kilo-client/src/main/java/org/httprpc/kilo/WebServiceProxy.java

@@ -44,14 +44,14 @@ private void testDocumentation(String name) throws IOException {
 
         var webServiceProxy = new WebServiceProxy("GET", baseURI.resolve(name));
 
-        webServiceProxy.setHeaders(mapOf(
-            entry("Accept", "application/json")
-        ));
-
         webServiceProxy.setArguments(mapOf(
             entry("api", "json")
         ));
 
+        webServiceProxy.setHeaders(mapOf(
+            entry("Accept", "application/json")
+        ));
+
         var actual = webServiceProxy.invoke();
 
         assertEquals(expected, actual);

kilo-test/src/test/java/org/httprpc/kilo/test/DocumentationTest.java

@@ -68,14 +68,14 @@ private void testPetsStreamJSON() throws IOException {
 
         var webServiceProxy = new WebServiceProxy("GET", baseURI.resolve("pets/stream"));
 
-        webServiceProxy.setHeaders(mapOf(
-            entry("Accept", "application/json")
-        ));
-
         webServiceProxy.setArguments(mapOf(
             entry("owner", "Gwen")
         ));
 
+        webServiceProxy.setHeaders(mapOf(
+            entry("Accept", "application/json")
+        ));
+
         var actual = webServiceProxy.invoke();
 
         assertEquals(expected, actual);
@@ -91,14 +91,14 @@ private void testPetsStreamCSV() throws IOException {
 
         var webServiceProxy = new WebServiceProxy("GET", baseURI.resolve("pets/stream"));
 
-        webServiceProxy.setHeaders(mapOf(
-            entry("Accept", "text/csv")
-        ));
-
         webServiceProxy.setArguments(mapOf(
             entry("owner", "Gwen")
         ));
 
+        webServiceProxy.setHeaders(mapOf(
+            entry("Accept", "text/csv")
+        ));
+
         webServiceProxy.setResponseHandler((inputStream, contentType) -> {
             var textDecoder = new TextDecoder();
 
@@ -129,14 +129,14 @@ private void testPetsStreamMarkup(String name, String mimeType) throws IOExcepti
 
         var webServiceProxy = new WebServiceProxy("GET", baseURI.resolve("pets/stream"));
 
-        webServiceProxy.setHeaders(mapOf(
-            entry("Accept", mimeType)
-        ));
-
         webServiceProxy.setArguments(mapOf(
             entry("owner", "Gwen")
         ));
 
+        webServiceProxy.setHeaders(mapOf(
+            entry("Accept", mimeType)
+        ));
+
         webServiceProxy.setResponseHandler((inputStream, contentType) -> {
             var textDecoder = new TextDecoder();