Merge branch 'master' of https://github.com/ServiceStack/ServiceStack.Java

Author: Layoric

src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestServiceTestsAsync.java

@@ -255,6 +255,26 @@ public void success() {
         });
     }
 
+    public void test_Can_delete_ReturnVoid_Async(){
+        final CountDownLatch signal = new CountDownLatch(1);
+
+        final List<String> sentMethods = new ArrayList<>();
+        client.RequestFilter = new ConnectionFilter() {
+            @Override
+            public void exec(HttpURLConnection conn) {
+                sentMethods.add(conn.getRequestMethod());
+            }
+        };
+
+        client.deleteAsync(new HelloReturnVoid().setId(1), new AsyncResultVoid() {
+            @Override
+            public void success() {
+                assertEquals(HttpMethods.Delete, sentMethods.get(sentMethods.size() - 1));
+                signal.countDown();
+            }
+        });
+    }
+
 
     /* TEST HELPERS */
     public static HelloAllTypes createHelloAllTypes(){

src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidServiceClient.java

@@ -96,6 +96,28 @@ protected void onPostExecute(T response) {
         }, request);
     }
 
+    @Override
+    public void getAsync(IReturnVoid request, final AsyncResultVoid asyncResult) {
+        final AndroidServiceClient client = this;
+        execTask(new AsyncTask<IReturnVoid, Void, Void>() {
+            @Override
+            protected Void doInBackground(IReturnVoid... params) {
+                try {
+                    client.get(params[0]);
+                } catch (Exception e) {
+                    asyncResult.setError(e);
+                }
+                return null;
+            }
+
+            @Override
+            protected void onPostExecute(Void noResponse) {
+                asyncResult.completeResult();
+            }
+
+        }, request);
+    }
+
     public <T> void getAsync(IReturn<T> request, final Map<String, String> queryParams, final AsyncResult<T> asyncResult){
         final AndroidServiceClient client = this;
         execTask(new AsyncTask<IReturn<T>, Void, T>() {
@@ -518,6 +540,28 @@ protected void onPostExecute(T response) {
         }, request);
     }
 
+    @Override
+    public void deleteAsync(IReturnVoid request, final AsyncResultVoid asyncResult) {
+        final AndroidServiceClient client = this;
+        execTask(new AsyncTask<IReturnVoid, Void, Void>() {
+            @Override
+            protected Void doInBackground(IReturnVoid... params) {
+                try {
+                    client.delete(params[0]);
+                } catch (Exception e) {
+                    asyncResult.setError(e);
+                }
+                return null;
+            }
+
+            @Override
+            protected void onPostExecute(Void noResponse) {
+                asyncResult.completeResult();
+            }
+
+        }, request);
+    }
+
     public <T> void deleteAsync(IReturn<T> request, final Map<String, String> queryParams, final AsyncResult<T> asyncResult){
         final AndroidServiceClient client = this;
         execTask(new AsyncTask<IReturn<T>, Void, T>() {

src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/TestServiceTests.java

@@ -247,10 +247,14 @@ public void exec(HttpURLConnection conn) {
 
         client.send(new HelloReturnVoid().setId(1));
         assertEquals(HttpMethods.Post, sentMethods.get(sentMethods.size() - 1));
+        client.get(new HelloReturnVoid().setId(2));
+        assertEquals(HttpMethods.Get, sentMethods.get(sentMethods.size() - 1));
         client.post(new HelloReturnVoid().setId(3));
         assertEquals(HttpMethods.Post, sentMethods.get(sentMethods.size() - 1));
-        client.put(new HelloReturnVoid().setId(2));
+        client.put(new HelloReturnVoid().setId(4));
         assertEquals(HttpMethods.Put, sentMethods.get(sentMethods.size() - 1));
+        client.delete(new HelloReturnVoid().setId(5));
+        assertEquals(HttpMethods.Delete, sentMethods.get(sentMethods.size() - 1));
     }
 
     public void test_Can_get_response_as_Raw_String(){

src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncServiceClient.java

@@ -12,6 +12,7 @@ public interface AsyncServiceClient {
     void sendAsync(IReturnVoid request, final AsyncResultVoid asyncResult);
 
     <T> void getAsync(IReturn<T> request, final AsyncResult<T> asyncResult);
+    void getAsync(IReturnVoid request, final AsyncResultVoid asyncResult);
     <T> void getAsync(IReturn<T> request, final Map<String, String> queryParams, final AsyncResult<T> asyncResult);
     <T> void getAsync(String path, final Class responseType, final AsyncResult<T> asyncResult);
     <T> void getAsync(String path, final Type responseType, final AsyncResult<T> asyncResult);
@@ -34,6 +35,7 @@ public interface AsyncServiceClient {
     void putAsync(String path, final byte[] requestBody, final String contentType, final AsyncResult<byte[]> asyncResult);
 
     <T> void deleteAsync(IReturn<T> request, final AsyncResult<T> asyncResult);
+    void deleteAsync(IReturnVoid request, final AsyncResultVoid asyncResult);
     <T> void deleteAsync(IReturn<T> request, final Map<String, String> queryParams, final AsyncResult<T> asyncResult);
     <T> void deleteAsync(String path, final Class responseType, final AsyncResult<T> asyncResult);
     <T> void deleteAsync(String path, final Type responseType, final AsyncResult<T> asyncResult);

src/AndroidClient/client/src/main/java/net/servicestack/client/JsonServiceClient.java

@@ -353,6 +353,11 @@ public <TResponse> TResponse get(IReturn<TResponse> request) {
                 request.getResponseType());
     }
 
+    @Override
+    public void get(IReturnVoid request) {
+        send(createRequest(createUrl(request), HttpMethods.Get), IReturnVoid.class);
+    }
+
     @Override
     public <TResponse> TResponse get(IReturn<TResponse> request, Map<String, String> queryParams) {
         return send(
@@ -478,6 +483,11 @@ public <TResponse> TResponse delete(IReturn<TResponse> request) {
             request.getResponseType());
     }
 
+    @Override
+    public void delete(IReturnVoid request) {
+        send(createRequest(createUrl(request), HttpMethods.Delete), IReturnVoid.class);
+    }
+
     @Override
     public <TResponse> TResponse delete(IReturn<TResponse> request, Map<String, String> queryParams) {
         return send(

src/AndroidClient/client/src/main/java/net/servicestack/client/ServiceClient.java

@@ -12,6 +12,7 @@ public interface ServiceClient {
     void send(IReturnVoid request);
 
     <TResponse> TResponse get(IReturn<TResponse> request);
+    void get(IReturnVoid request);
     <TResponse> TResponse get(IReturn<TResponse> request, Map<String,String> queryParams);
     <TResponse> TResponse get(String path, Class responseType);
     <TResponse> TResponse get(String path, Type responseType);
@@ -34,6 +35,7 @@ public interface ServiceClient {
     HttpURLConnection put(String path, byte[] requestBody, String contentType);
 
     <TResponse> TResponse delete(IReturn<TResponse> request);
+    void delete(IReturnVoid request);
     <TResponse> TResponse delete(IReturn<TResponse> request, Map<String,String> queryParams);
     <TResponse> TResponse delete(String path, Class responseType);
     <TResponse> TResponse delete(String path, Type responseType);